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 62a40082a78..9a66b9819c3 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -68,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);
 
@@ -136,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);
 
@@ -153,7 +159,9 @@ 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) {
@@ -178,15 +186,15 @@ if (empty($reshook)) {
 		$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
@@ -198,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();
 
@@ -215,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');
@@ -236,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);
@@ -257,13 +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
@@ -293,8 +302,12 @@ 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;
 			}
@@ -325,38 +338,47 @@ if (empty($reshook)) {
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'classin' && $usercancreate) {
+	} elseif ($action == 'classin' && $usercancreate) {
 		$object->fetch($id);
 		$object->setProject($_POST['projectid']);
 	} 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) {
 		$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);
+		}
 	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {	 // Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {	// Multicurrency rate
@@ -365,16 +387,19 @@ if (empty($reshook)) {
 		$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);
@@ -407,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++;
@@ -441,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);
@@ -456,7 +488,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');
+				}
 			}
 		}
 	} elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {		// Set incoterm
@@ -489,8 +523,7 @@ if (empty($reshook)) {
 
 			//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');
@@ -507,8 +540,12 @@ if (empty($reshook)) {
 		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);
@@ -516,7 +553,9 @@ 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) {
 		$object->fetch($id);
@@ -525,8 +564,7 @@ if (empty($reshook)) {
 		$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);
@@ -544,11 +582,9 @@ if (empty($reshook)) {
 			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');
@@ -605,12 +641,15 @@ if (empty($reshook)) {
 			$result = $object->validate($user, '', $idwarehouse);
 			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);
@@ -621,15 +660,20 @@ 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);
@@ -682,14 +726,20 @@ if (empty($reshook)) {
 			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)) {
 						$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);
@@ -703,35 +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
@@ -741,8 +797,12 @@ 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 ($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();
@@ -810,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;
@@ -852,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.
 					}
@@ -887,8 +948,8 @@ 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) {
 			$paiement = new Paiement($db);
@@ -901,10 +962,8 @@ if (empty($reshook)) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 			}
 		}
-	} /*
-	 * Insert new invoice in database
-	 */
-	elseif ($action == 'add' && $usercancreate) {
+	} elseif ($action == 'add' && $usercancreate) {
+		// Insert new invoice in database
 		if ($socid > 0) {
 			$object->socid = GETPOST('socid', 'int');
 		}
@@ -916,7 +975,9 @@ 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) {
@@ -994,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;
 				}
@@ -1037,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
@@ -1360,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);
@@ -1401,7 +1457,9 @@ if (empty($reshook)) {
 
 								$TTotalByTva = array();
 								foreach ($srcobject->lines as &$line) {
-									if (!empty($line->special_code)) continue;
+									if (!empty($line->special_code)) {
+										continue;
+									}
 									$TTotalByTva[$line->tva_tx] += $line->total_ttc;
 								}
 
@@ -1419,8 +1477,7 @@ if (empty($reshook)) {
 										$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
@@ -1447,8 +1504,7 @@ if (empty($reshook)) {
 								$amount_ttc_diff = $amountdeposit[0];
 							}
 
-							foreach ($amountdeposit as $tva => $amount)
-							{
+							foreach ($amountdeposit as $tva => $amount) {
 								if (empty($amount)) {
 									continue;
 								}
@@ -1467,31 +1523,31 @@ 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;
@@ -1504,8 +1560,7 @@ if (empty($reshook)) {
 						}
 
 						// 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 (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')) {
@@ -1554,10 +1609,11 @@ if (empty($reshook)) {
 
 									$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;
@@ -1615,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 ?
@@ -1623,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) {
@@ -1654,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++;
 						}
@@ -1732,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');
 						}
 
@@ -1760,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;
@@ -1780,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;
 								}
 							}
@@ -1814,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);
@@ -1832,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);
@@ -1852,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);
@@ -1873,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;
 
@@ -1884,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 {
@@ -1911,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++;
 			}
@@ -1923,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.
@@ -1990,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);
 
@@ -2013,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');
@@ -2035,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);
@@ -2055,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))) {
@@ -2065,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);
@@ -2099,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');
@@ -2116,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));
@@ -2133,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);
@@ -2151,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']);
@@ -2196,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
@@ -2214,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);
@@ -2238,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++;
@@ -2270,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') : '');
 
@@ -2303,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.
@@ -2324,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;
@@ -2337,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);
@@ -2400,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;
 						}
 					}
@@ -2456,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;
@@ -2469,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 {
@@ -2496,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);
 									}
 								}
@@ -2507,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 {
@@ -2526,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;
@@ -2603,8 +2701,7 @@ if (empty($reshook)) {
 				}
 			}
 
-			if ($error)
-			{
+			if ($error) {
 				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
 			}
 		}
@@ -2614,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';
@@ -2632,14 +2731,14 @@ 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++;
 			}
@@ -2709,7 +2808,9 @@ $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();
 
@@ -2720,8 +2821,7 @@ llxHeader('', $title, $helpurl);
 
 // Mode creation
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$facturestatic = new Facture($db);
 	$extrafields->fetch_name_optionals_label($facturestatic->table_element);
 
@@ -2781,8 +2881,9 @@ 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);
@@ -2822,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
@@ -2841,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
@@ -2854,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));
 
@@ -2869,8 +2977,7 @@ if ($action == 'create')
 		$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>';
@@ -2879,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">';
@@ -2888,7 +2997,9 @@ 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('');
 
@@ -2915,9 +3026,10 @@ if ($action == 'create')
 		$outstandingBills = $arrayoutstandingbills['opened'];
 		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 '</td>';
@@ -2948,7 +3060,9 @@ 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";
 	}
@@ -2958,15 +3072,21 @@ if ($action == 'create')
 		$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';
@@ -2985,8 +3105,7 @@ if ($action == 'create')
 				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'));
 					}
@@ -3100,7 +3219,7 @@ if ($action == 'create')
 			print '</tr></table>';
 
 			print '</div></div>';
-   		}
+		}
 	}
 
 	if ($socid > 0) {
@@ -3124,8 +3243,9 @@ if ($action == 'create')
 			$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>';
@@ -3146,8 +3266,9 @@ if ($action == 'create')
 			if (is_array($facids)) {
 				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>';
@@ -3234,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']).')';
@@ -3289,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);
@@ -3513,7 +3638,9 @@ if ($action == 'create')
 	$htmltext = '';
 	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).')',
@@ -3665,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();
@@ -3688,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;
@@ -3722,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);
@@ -3735,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);
@@ -3744,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),
@@ -3769,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') {
@@ -3810,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);
@@ -3819,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';
@@ -3843,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);
@@ -3855,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);
@@ -3864,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';
@@ -3965,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);
 	}
@@ -3977,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)),
@@ -3988,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(
@@ -3999,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;
@@ -4027,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> : ';
 			}
@@ -4097,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);
@@ -4265,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') {
@@ -4299,8 +4426,9 @@ if ($action == 'create')
 		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') {
@@ -4318,8 +4446,11 @@ if ($action == 'create')
 		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>';
@@ -4351,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().'">';
@@ -4575,7 +4705,9 @@ if ($action == 'create')
 		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>';
@@ -4597,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>';
@@ -4615,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>';
@@ -4629,12 +4765,16 @@ if ($action == 'create')
 		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>';
@@ -4644,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;
 
@@ -4664,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>';
@@ -4676,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>';
@@ -4687,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
 
@@ -4816,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>';
@@ -4828,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);
@@ -4871,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>';
@@ -4932,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>';
@@ -5093,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>';
@@ -5105,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>';
 				}
 			}
@@ -5119,7 +5268,9 @@ 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>';
+						}
 					}
 				}
 			}
@@ -5173,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
@@ -5192,23 +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 ($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>';
@@ -5218,8 +5364,7 @@ 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 (($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>';
 				}
@@ -5233,8 +5378,7 @@ if ($action == 'create')
 				&& !$objectidnext
 				&& $object->is_last_in_cycle()
 				&& $conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE
-				)
-			{
+				) {
 				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 {
@@ -5243,30 +5387,26 @@ 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) {
 					print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
 				} else {
@@ -5287,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>';
@@ -5298,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>';
@@ -5330,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;
 
@@ -5342,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);
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']) {