From ebfba19778e595fe083e04a78b4f86e320b64103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 26 Feb 2021 21:17:52 +0100
Subject: [PATCH] code syntax s... t..  dir

---
 htdocs/salaries/admin/salaries.php            |   23 +-
 .../salaries/admin/salaries_extrafields.php   |   17 +-
 htdocs/salaries/card.php                      |  128 +-
 htdocs/salaries/class/salariesstats.class.php |    7 +-
 htdocs/salaries/document.php                  |   22 +-
 htdocs/salaries/info.php                      |    4 +-
 htdocs/salaries/stats/index.php               |   48 +-
 htdocs/societe/admin/contact_extrafields.php  |   17 +-
 htdocs/societe/admin/societe.php              |  277 ++--
 htdocs/societe/admin/societe_extrafields.php  |   17 +-
 htdocs/societe/agenda.php                     |   71 +-
 htdocs/societe/ajax/company.php               |   46 +-
 htdocs/societe/ajaxcompanies.php              |   55 +-
 htdocs/societe/ajaxcountries.php              |   33 +-
 .../canvas/actions_card_common.class.php      |  155 ++-
 .../company/actions_card_company.class.php    |   45 +-
 .../canvas/company/tpl/card_create.tpl.php    |   53 +-
 .../canvas/company/tpl/card_edit.tpl.php      |   27 +-
 .../canvas/company/tpl/card_view.tpl.php      |   49 +-
 .../actions_card_individual.class.php         |   18 +-
 .../canvas/individual/tpl/card_create.tpl.php |   39 +-
 .../canvas/individual/tpl/card_edit.tpl.php   |    7 +-
 .../canvas/individual/tpl/card_view.tpl.php   |   15 +-
 htdocs/societe/card.php                       | 1063 +++++++-------
 htdocs/societe/checkvat/checkVatPopup.php     |   51 +-
 htdocs/societe/class/api_contacts.class.php   |  121 +-
 .../societe/class/api_thirdparties.class.php  |  192 +--
 htdocs/societe/class/client.class.php         |   23 +-
 .../class/companybankaccount.class.php        |  115 +-
 .../class/companypaymentmode.class.php        |   92 +-
 htdocs/societe/class/societe.class.php        |   20 +-
 htdocs/societe/class/societeaccount.class.php |  126 +-
 htdocs/societe/consumption.php                |  264 ++--
 htdocs/societe/contact.php                    |   68 +-
 htdocs/societe/document.php                   |   49 +-
 htdocs/societe/index.php                      |  128 +-
 htdocs/societe/list.php                       | 1234 +++++++++++------
 htdocs/societe/note.php                       |   66 +-
 htdocs/societe/notify/card.php                |  212 +--
 htdocs/societe/paymentmodes.php               |  679 +++++----
 htdocs/societe/price.php                      |   63 +-
 htdocs/societe/project.php                    |   28 +-
 htdocs/societe/societecontact.php             |  136 +-
 .../tpl/linesalesrepresentative.tpl.php       |    4 +-
 htdocs/societe/website.php                    |  277 ++--
 htdocs/stripe/admin/stripe.php                |  106 +-
 htdocs/stripe/charge.php                      |   69 +-
 htdocs/stripe/class/actions_stripe.class.php  |   24 +-
 htdocs/stripe/class/stripe.class.php          |  298 ++--
 htdocs/stripe/config.php                      |    3 +-
 htdocs/stripe/lib/stripe.lib.php              |   37 +-
 htdocs/stripe/payout.php                      |   22 +-
 htdocs/stripe/transaction.php                 |   29 +-
 .../admin/supplier_proposal_extrafields.php   |   17 +-
 .../supplier_proposaldet_extrafields.php      |   20 +-
 htdocs/supplier_proposal/card.php             |  550 ++++----
 .../class/api_supplier_proposals.class.php    |   47 +-
 .../class/supplier_proposal.class.php         |  856 ++++++------
 htdocs/supplier_proposal/contact.php          |   50 +-
 htdocs/supplier_proposal/document.php         |   30 +-
 htdocs/supplier_proposal/index.php            |  139 +-
 htdocs/supplier_proposal/info.php             |   10 +-
 htdocs/supplier_proposal/list.php             |  668 +++++----
 htdocs/supplier_proposal/note.php             |   23 +-
 .../tpl/linkedobjectblock.tpl.php             |   53 +-
 htdocs/support/inc.php                        |  103 +-
 htdocs/support/index.php                      |   59 +-
 htdocs/takepos/admin/appearance.php           |   17 +-
 htdocs/takepos/admin/bar.php                  |   23 +-
 htdocs/takepos/admin/orderprinters.php        |   68 +-
 htdocs/takepos/admin/other.php                |   12 +-
 htdocs/takepos/admin/printqr.php              |    7 +-
 htdocs/takepos/admin/receipt.php              |   37 +-
 htdocs/takepos/admin/setup.php                |   71 +-
 htdocs/takepos/admin/terminal.php             |  101 +-
 htdocs/takepos/ajax/ajax.php                  |   43 +-
 htdocs/takepos/css/pos.css.php                |  195 +--
 htdocs/takepos/floors.php                     |   95 +-
 htdocs/takepos/freezone.php                   |   35 +-
 htdocs/takepos/genimg/index.php               |   40 +-
 htdocs/takepos/genimg/qr.php                  |   35 +-
 htdocs/takepos/index.php                      |  438 +++---
 htdocs/takepos/invoice.php                    |  645 +++++----
 htdocs/takepos/pay.php                        |  224 +--
 htdocs/takepos/phone.php                      |   99 +-
 htdocs/takepos/public/auto_order.php          |   26 +-
 htdocs/takepos/public/menu.php                |   51 +-
 htdocs/takepos/receipt.php                    |  193 ++-
 htdocs/takepos/reduction.php                  |  191 +--
 htdocs/takepos/send.php                       |   29 +-
 htdocs/takepos/smpcb.php                      |   20 +-
 91 files changed, 6658 insertions(+), 5434 deletions(-)

diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index 2b429dc79ec..01f25d56d05 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -27,14 +27,17 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'salaries'));
 
 // Security check
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 $action = GETPOST('action', 'aZ09');
 
@@ -47,8 +50,7 @@ $list = array(
  * Actions
  */
 
-if ($action == 'update')
-{
+if ($action == 'update') {
 	$error = 0;
 
 	foreach ($list as $constname) {
@@ -59,8 +61,7 @@ if ($action == 'update')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -74,7 +75,9 @@ if ($action == 'update')
 llxHeader('', $langs->trans('SalariesSetup'));
 
 $form = new Form($db);
-if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+if (!empty($conf->accounting->enabled)) {
+	$formaccounting = new FormAccounting($db);
+}
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans('SalariesSetup'), $linkback, 'title_setup');
@@ -99,8 +102,7 @@ print '<td>'.$langs->trans("Parameters").'</td>';
 print '<td width="60">'.$langs->trans("Value")."</td>\n";
 print "</tr>\n";
 
-foreach ($list as $key)
-{
+foreach ($list as $key) {
 	print '<tr class="oddeven value">';
 
 	// Param
@@ -109,8 +111,7 @@ foreach ($list as $key)
 
 	// Value
 	print '<td>';
-	if (!empty($conf->accounting->enabled))
-	{
+	if (!empty($conf->accounting->enabled)) {
 		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
 	} else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
diff --git a/htdocs/salaries/admin/salaries_extrafields.php b/htdocs/salaries/admin/salaries_extrafields.php
index 62073f8177b..59074e582d2 100644
--- a/htdocs/salaries/admin/salaries_extrafields.php
+++ b/htdocs/salaries/admin/salaries_extrafields.php
@@ -36,13 +36,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 = 'payment_salary'; //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 '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -91,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -104,8 +106,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 2fc71bec099..af2aecdfe14 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -31,15 +31,16 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.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';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "banks", "bills", "users", "salaries", "hrm"));
-if (!empty($conf->projet->enabled))	$langs->load("projects");
+if (!empty($conf->projet->enabled)) {
+	$langs->load("projects");
+}
 
 $id = GETPOST("id", 'int');
 $action = GETPOST('action', 'aZ09');
@@ -54,7 +55,9 @@ $dateep = dol_mktime(12, 0, 0, GETPOST("dateepmonth", 'int'), GETPOST("dateepday
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'salaries', '', '', '');
 
 $object = new PaymentSalary($db);
@@ -71,24 +74,23 @@ $hookmanager->initHooks(array('salarycard', 'globalcard'));
  * Actions
  */
 
-if ($cancel)
-{
+if ($cancel) {
 	header("Location: list.php");
 	exit;
 }
 
 // Link to a project
-if ($action == 'classin' && $user->rights->banque->modifier)
-{
+if ($action == 'classin' && $user->rights->banque->modifier) {
 	$object->fetch($id);
 	$object->setProject($projectid);
 }
 
-if ($action == 'add' && empty($cancel))
-{
+if ($action == 'add' && empty($cancel)) {
 	$error = 0;
 
-	if (empty($datev)) $datev = $datep;
+	if (empty($datev)) {
+		$datev = $datep;
+	}
 
 	$type_payment = dol_getIdFromCode($db, GETPOST("paymenttype", 'alpha'), 'c_paiement', 'code', 'id', 1);
 
@@ -113,41 +115,36 @@ if ($action == 'add' && empty($cancel))
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
-	if ($ret < 0) $error++;
+	if ($ret < 0) {
+		$error++;
+	}
 
-	if (empty($datep) || empty($datev) || empty($datesp) || empty($dateep))
-	{
+	if (empty($datep) || empty($datev) || empty($datesp) || empty($dateep)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 		$error++;
 	}
-	if (empty($object->fk_user) || $object->fk_user < 0)
-	{
+	if (empty($object->fk_user) || $object->fk_user < 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Employee")), null, 'errors');
 		$error++;
 	}
-	if (empty($type_payment) || $type_payment < 0)
-	{
+	if (empty($type_payment) || $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($conf->banque->enabled) && !$object->accountid > 0)
-	{
+	if (!empty($conf->banque->enabled) && !$object->accountid > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->begin();
 
 		$ret = $object->create($user);
-		if ($ret > 0)
-		{
+		if ($ret > 0) {
 			$db->commit();
 
 			if (GETPOST('saveandnew', 'alpha')) {
@@ -168,26 +165,23 @@ if ($action == 'add' && empty($cancel))
 	$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.'/salaries/list.php');
 				exit;
@@ -213,27 +207,25 @@ if ($action == 'delete')
 llxHeader("", $langs->trans("SalaryPayment"));
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
-if ($id)
-{
+if ($id) {
 	$object = new PaymentSalary($db);
 	$result = $object->fetch($id);
-	if ($result <= 0)
-	{
+	if ($result <= 0) {
 		dol_print_error($db);
 		exit;
 	}
 }
 
 // Create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$year_current = strftime("%Y", dol_now());
 	$pastmonth = strftime("%m", dol_now()) - 1;
 	$pastmonthyear = $year_current;
-	if ($pastmonth == 0)
-	{
+	if ($pastmonth == 0) {
 		$pastmonth = 12;
 		$pastmonthyear--;
 	}
@@ -247,8 +239,7 @@ if ($action == 'create')
 	$datesp = dol_mktime(0, 0, 0, $datespmonth, $datespday, $datespyear);
 	$dateep = dol_mktime(23, 59, 59, $dateepmonth, $dateepday, $dateepyear);
 
-	if (empty($datesp) || empty($dateep)) // We define date_start and date_end
-	{
+	if (empty($datesp) || empty($dateep)) { // We define date_start and date_end
 		$datesp = dol_get_first_day($pastmonthyear, $pastmonth, false); $dateep = dol_get_last_day($pastmonthyear, $pastmonth, false);
 	}
 
@@ -306,8 +297,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, '', 1); // Affiche liste des comptes courant
@@ -321,8 +311,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>';
@@ -331,21 +320,19 @@ if ($action == 'create')
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
-	    $formproject = new FormProjets($db);
+	if (!empty($conf->projet->enabled)) {
+		$formproject = new FormProjets($db);
 
-	    print '<tr><td>'.$langs->trans("Project").'</td><td>';
-	    $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
-	    print '</td></tr>';
+		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+		$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
+		print '</td></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;
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
@@ -371,8 +358,7 @@ if ($action == 'create')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($id)
-{
+if ($id) {
 	$head = salaries_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'card', $langs->trans("SalaryPayment"), -1, 'salary');
@@ -387,11 +373,9 @@ if ($id)
 	$morehtmlref .= $langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->salaries->write)
-		{
+		if ($user->rights->salaries->write) {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 			}
@@ -450,10 +434,8 @@ if ($id)
 
 	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</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);
 
@@ -479,10 +461,8 @@ if ($id)
 	// Action buttons
 
 	print '<div class="tabsAction">'."\n";
-	if ($object->rappro == 0)
-	{
-		if (!empty($user->rights->salaries->delete))
-		{
+	if ($object->rappro == 0) {
+		if (!empty($user->rights->salaries->delete)) {
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
diff --git a/htdocs/salaries/class/salariesstats.class.php b/htdocs/salaries/class/salariesstats.class.php
index 0fcef8682a8..66c0e1e7d1f 100644
--- a/htdocs/salaries/class/salariesstats.class.php
+++ b/htdocs/salaries/class/salariesstats.class.php
@@ -65,8 +65,11 @@ class SalariesStats extends Stats
 		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/salaries/document.php b/htdocs/salaries/document.php
index 777686c96db..f9be4f70fb0 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -45,7 +45,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, 'salaries', '', '', '');
 
 
@@ -54,12 +56,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 PaymentSalary($db);
@@ -84,8 +92,7 @@ $form = new Form($db);
 
 llxHeader("", $langs->trans("SalaryPayment"));
 
-if ($object->id)
-{
+if ($object->id) {
 	$object->fetch_thirdparty();
 
 	$head = salaries_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/salaries/info.php b/htdocs/salaries/info.php
index c7a5090072e..7c999939570 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -36,7 +36,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, 'salaries', '', '', '');
 
 
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index 99b2fd9042f..e6ef351bd4e 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -32,13 +32,19 @@ $langs->loadLangs(array("salaries", "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
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'salaries', '', '', '');
 
 $nowyear = strftime("%Y", dol_now());
@@ -80,12 +86,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=salariesstats&amp;file=sala
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -112,12 +116,10 @@ $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=salariesstats&amp;file=
 
 $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++;
 	}
@@ -143,12 +145,10 @@ $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=salariesstats&file=salari
 
 $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++;
 	}
@@ -173,7 +173,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;
@@ -203,7 +205,9 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0
 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>';
@@ -222,11 +226,9 @@ print '<td class="right">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	$year = $val['year'];
-	while ($year && $oldyear > $year + 1)
-	{
+	while ($year && $oldyear > $year + 1) {
 		// If we have empty year
 		$oldyear--;
 
@@ -256,7 +258,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/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index a52bf52332b..3841a7c66ea 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -36,13 +36,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 = 'socpeople'; //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -77,8 +81,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -91,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -104,8 +106,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 3b9c1a9daa4..d0edd54f946 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -35,7 +35,9 @@ $langs->loadLangs(array("admin", "companies", "other"));
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $formcompany = new FormCompany($db);
 
@@ -47,10 +49,8 @@ $formcompany = new FormCompany($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
-if ($action == 'setcodeclient')
-{
-	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0)
-	{
+if ($action == 'setcodeclient') {
+	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -58,10 +58,8 @@ if ($action == 'setcodeclient')
 	}
 }
 
-if ($action == 'setcodecompta')
-{
-	if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0)
-	{
+if ($action == 'setcodecompta') {
+	if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -69,41 +67,40 @@ if ($action == 'setcodecompta')
 	}
 }
 
-if ($action == 'updateoptions')
-{
-	if (GETPOST('COMPANY_USE_SEARCH_TO_SELECT'))
-	{
+if ($action == 'updateoptions') {
+	if (GETPOST('COMPANY_USE_SEARCH_TO_SELECT')) {
 		$companysearch = GETPOST('activate_COMPANY_USE_SEARCH_TO_SELECT', 'alpha');
 		$res = dolibarr_set_const($db, "COMPANY_USE_SEARCH_TO_SELECT", $companysearch, 'chaine', 0, '', $conf->entity);
-		if (!($res > 0)) $error++;
-		if (!$error)
-		{
+		if (!($res > 0)) {
+			$error++;
+		}
+		if (!$error) {
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
 
-	if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT'))
-	{
+	if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT')) {
 		$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT', 'alpha');
 		$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch, 'chaine', 0, '', $conf->entity);
-		if (!($res > 0)) $error++;
-		if (!$error)
-		{
+		if (!($res > 0)) {
+			$error++;
+		}
+		if (!$error) {
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
 
-	if (GETPOST('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT'))
-	{
+	if (GETPOST('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')) {
 		$customertypedefault = GETPOST('defaultcustomertype', 'int');
 		$res = dolibarr_set_const($db, "THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT", $customertypedefault, 'chaine', 0, '', $conf->entity);
-		if (!($res > 0)) $error++;
-		if (!$error)
-		{
+		if (!($res > 0)) {
+			$error++;
+		}
+		if (!$error) {
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
@@ -112,8 +109,7 @@ if ($action == 'updateoptions')
 }
 
 // Activate a document generator module
-if ($action == 'set')
-{
+if ($action == 'set') {
 	$label = GETPOST('label', 'alpha');
 	$scandir = GETPOST('scan_dir', 'alpha');
 
@@ -125,22 +121,24 @@ if ($action == 'set')
 	$sql .= ")";
 
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 }
 
 // Disable a document generator module
-if ($action == 'del')
-{
+if ($action == 'del') {
 	$type = 'company';
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
 	$sql .= " WHERE nom='".$db->escape($value)."' AND type='".$db->escape($type)."' AND entity=".$conf->entity;
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 }
 
 // Define default generator
-if ($action == 'setdoc')
-{
+if ($action == 'setdoc') {
 	$label = GETPOST('label', 'alpha');
 	$scandir = GETPOST('scan_dir', 'alpha');
 
@@ -164,8 +162,7 @@ if ($action == 'setdoc')
 	$sql .= ")";
 	dol_syslog("societe.php", LOG_DEBUG);
 	$result2 = $db->query($sql);
-	if ($result1 && $result2)
-	{
+	if ($result1 && $result2) {
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -176,9 +173,10 @@ if ($action == 'setdoc')
 if ($action == "setaddrefinlist") {
 	$setaddrefinlist = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "SOCIETE_ADD_REF_IN_LIST", $setaddrefinlist, 'yesno', 0, '', $conf->entity);
-	if (!($res > 0)) $error++;
-	if (!$error)
-	{
+	if (!($res > 0)) {
+		$error++;
+	}
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -189,9 +187,10 @@ if ($action == "setaddrefinlist") {
 if ($action == "setaddadressinlist") {
 	$val = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "COMPANY_SHOW_ADDRESS_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
-	if (!($res > 0)) $error++;
-	if (!$error)
-	{
+	if (!($res > 0)) {
+		$error++;
+	}
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -202,7 +201,9 @@ if ($action == "setaddadressinlist") {
 if ($action == "setaddemailphonetownincontactlist") {
 	$val = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST", $val, 'yesno', 0, '', $conf->entity);
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -214,9 +215,10 @@ if ($action == "setaddemailphonetownincontactlist") {
 if ($action == "setaskforshippingmet") {
 	$setaskforshippingmet = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "SOCIETE_ASK_FOR_SHIPPING_METHOD", $setaskforshippingmet, 'yesno', 0, '', $conf->entity);
-	if (!($res > 0)) $error++;
-	if (!$error)
-	{
+	if (!($res > 0)) {
+		$error++;
+	}
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -227,9 +229,10 @@ if ($action == "setaskforshippingmet") {
 if ($action == "setdisableprospectcustomer") {
 	$setdisableprospectcustomer = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer, 'yesno', 0, '', $conf->entity);
-	if (!($res > 0)) $error++;
-	if (!$error)
-	{
+	if (!($res > 0)) {
+		$error++;
+	}
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -237,13 +240,11 @@ if ($action == "setdisableprospectcustomer") {
 }
 
 //Activate ProfId unique
-if ($action == 'setprofid')
-{
+if ($action == 'setprofid') {
 	$status = GETPOST('status', 'alpha');
 
 	$idprof = "SOCIETE_".$value."_UNIQUE";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
+	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0) {
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
 	} else {
@@ -252,13 +253,11 @@ if ($action == 'setprofid')
 }
 
 //Activate ProfId mandatory
-if ($action == 'setprofidmandatory')
-{
+if ($action == 'setprofidmandatory') {
 	$status = GETPOST('status', 'alpha');
 
 	$idprof = "SOCIETE_".$value."_MANDATORY";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
+	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0) {
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
 	} else {
@@ -267,13 +266,11 @@ if ($action == 'setprofidmandatory')
 }
 
 //Activate ProfId invoice mandatory
-if ($action == 'setprofidinvoicemandatory')
-{
+if ($action == 'setprofidinvoicemandatory') {
 	$status = GETPOST('status', 'alpha');
 
 	$idprof = "SOCIETE_".$value."_INVOICE_MANDATORY";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
+	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0) {
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
 	} else {
@@ -282,12 +279,10 @@ if ($action == 'setprofidinvoicemandatory')
 }
 
 //Set hide closed customer into combox or select
-if ($action == 'sethideinactivethirdparty')
-{
+if ($action == 'sethideinactivethirdparty') {
 	$status = GETPOST('status', 'alpha');
 
-	if (dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX", $status, 'chaine', 0, '', $conf->entity) > 0)
-	{
+	if (dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX", $status, 'chaine', 0, '', $conf->entity) > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -297,9 +292,10 @@ if ($action == 'sethideinactivethirdparty')
 if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
 	$setonsearchandlistgooncustomerorsuppliercard = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD", $setonsearchandlistgooncustomerorsuppliercard, 'yesno', 0, '', $conf->entity);
-	if (!($res > 0)) $error++;
-	if (!$error)
-	{
+	if (!($res > 0)) {
+		$error++;
+	}
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -326,7 +322,9 @@ $head = societe_admin_prepare_head();
 print dol_get_fiche_head($head, 'general', $langs->trans("ThirdParties"), -1, 'company');
 
 $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-foreach ($conf->modules_parts['models'] as $mo)		$dirsociete[] = $mo.'core/modules/societe/'; //Add more models
+foreach ($conf->modules_parts['models'] as $mo) {
+	$dirsociete[] = $mo.'core/modules/societe/'; //Add more models
+}
 
 // Module to manage customer/supplier code
 
@@ -344,32 +342,31 @@ print "</tr>\n";
 
 $arrayofmodules = array();
 
-foreach ($dirsociete as $dirroot)
-{
+foreach ($dirsociete as $dirroot) {
 	$dir = dol_buildpath($dirroot, 0);
 
 	$handle = @opendir($dir);
-	if (is_resource($handle))
-	{
+	if (is_resource($handle)) {
 		// Loop on each module find in opened directory
-		while (($file = readdir($handle)) !== false)
-		{
-			if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php')
-			{
+		while (($file = readdir($handle)) !== false) {
+			if (substr($file, 0, 15) == 'mod_codeclient_' && substr($file, -3) == 'php') {
 				$file = substr($file, 0, dol_strlen($file) - 4);
 
 				try {
 					dol_include_once($dirroot.$file.'.php');
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					dol_syslog($e->getMessage(), LOG_ERR);
 				}
 
 				$modCodeTiers = new $file;
 
 				// Show modules according to features level
-				if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-				if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+				if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					continue;
+				}
+				if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					continue;
+				}
 
 				$arrayofmodules[$file] = $modCodeTiers;
 			}
@@ -380,24 +377,26 @@ foreach ($dirsociete as $dirroot)
 
 $arrayofmodules = dol_sort_array($arrayofmodules, 'position');
 
-foreach ($arrayofmodules as $file => $modCodeTiers)
-{
+foreach ($arrayofmodules as $file => $modCodeTiers) {
 	print '<tr class="oddeven">'."\n";
 	print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
 	print '<td>'.$modCodeTiers->info($langs).'</td>'."\n";
 	print '<td class="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n";
 
-	if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file")
-	{
+	if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file") {
 		print '<td class="center">'."\n";
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print "</td>\n";
 	} else {
 		$disabled = (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false);
 		print '<td class="center">';
-		if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+		if (!$disabled) {
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
+		}
 		print img_picto($langs->trans("Disabled"), 'switch_off');
-		if (!$disabled) print '</a>';
+		if (!$disabled) {
+			print '</a>';
+		}
 		print '</td>';
 	}
 
@@ -430,23 +429,18 @@ print "</tr>\n";
 
 $arrayofmodules = array();
 
-foreach ($dirsociete as $dirroot)
-{
+foreach ($dirsociete as $dirroot) {
 	$dir = dol_buildpath($dirroot, 0);
 
 	$handle = @opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle)) !== false)
-		{
-			if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php')
-			{
+	if (is_resource($handle)) {
+		while (($file = readdir($handle)) !== false) {
+			if (substr($file, 0, 15) == 'mod_codecompta_' && substr($file, -3) == 'php') {
 				$file = substr($file, 0, dol_strlen($file) - 4);
 
 				try {
 					dol_include_once($dirroot.$file.'.php');
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					dol_syslog($e->getMessage(), LOG_ERR);
 				}
 
@@ -462,16 +456,14 @@ foreach ($dirsociete as $dirroot)
 $arrayofmodules = dol_sort_array($arrayofmodules, 'position');
 
 
-foreach ($arrayofmodules as $file => $modCodeCompta)
-{
+foreach ($arrayofmodules as $file => $modCodeCompta) {
 	print '<tr class="oddeven">';
 	print '<td>'.$modCodeCompta->name."</td><td>\n";
 	print $modCodeCompta->info($langs);
 	print '</td>';
 	print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
 
-	if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file")
-	{
+	if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file") {
 		print '<td class="center">';
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print '</td>';
@@ -503,12 +495,10 @@ $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql .= " WHERE type = 'company'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$i = 0;
 	$num_rows = $db->num_rows($resql);
-	while ($i < $num_rows)
-	{
+	while ($i < $num_rows) {
 		$array = $db->fetch_array($resql);
 		array_push($def, $array[0]);
 		$i++;
@@ -527,24 +517,19 @@ print '<td class="center" width="60">'.$langs->trans("ShortInfo").'</td>';
 print '<td class="center" width="60">'.$langs->trans("Preview").'</td>';
 print "</tr>\n";
 
-foreach ($dirsociete as $dirroot)
-{
+foreach ($dirsociete as $dirroot) {
 	$dir = dol_buildpath($dirroot.'doc/', 0);
 
 	$handle = @opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle)) !== false)
-		{
-			if (preg_match('/\.modules\.php$/i', $file))
-			{
+	if (is_resource($handle)) {
+		while (($file = readdir($handle)) !== false) {
+			if (preg_match('/\.modules\.php$/i', $file)) {
 				$name = substr($file, 4, dol_strlen($file) - 16);
 				$classname = substr($file, 0, dol_strlen($file) - 12);
 
 				try {
 					dol_include_once($dirroot.'doc/'.$file);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					dol_syslog($e->getMessage(), LOG_ERR);
 				}
 
@@ -552,22 +537,26 @@ foreach ($dirsociete as $dirroot)
 
 				$modulequalified = 1;
 				if (!empty($module->version)) {
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-					elseif ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						$modulequalified = 0;
+					} elseif ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						$modulequalified = 0;
+					}
 				}
 
-				if ($modulequalified)
-				{
+				if ($modulequalified) {
 					print '<tr class="oddeven"><td width="100">';
 					print $module->name;
 					print "</td><td>\n";
-					if (method_exists($module, 'info')) print $module->info($langs);
-					else print $module->description;
+					if (method_exists($module, 'info')) {
+						print $module->info($langs);
+					} else {
+						print $module->description;
+					}
 					print '</td>';
 
 					// Activate / Disable
-					if (in_array($name, $def))
-					{
+					if (in_array($name, $def)) {
 						print "<td class=\"center\">\n";
 						//if ($conf->global->COMPANY_ADDON_PDF != "$name")
 						//{
@@ -581,8 +570,7 @@ foreach ($dirsociete as $dirroot)
 						//}
 						print "</td>";
 					} else {
-						if (versioncompare($module->phpmin, versionphparray()) > 0)
-						{
+						if (versioncompare($module->phpmin, versionphparray()) > 0) {
 							print '<td class="center">'."\n";
 							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off');
 							print "</td>";
@@ -596,8 +584,7 @@ foreach ($dirsociete as $dirroot)
 					// Info
 					$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
 					$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-					if ($module->type == 'pdf')
-					{
+					if ($module->type == 'pdf') {
 						$htmltooltip .= '<br>'.$langs->trans("Height").'/'.$langs->trans("Width").': '.$module->page_hauteur.'/'.$module->page_largeur;
 					}
 					$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
@@ -609,8 +596,7 @@ foreach ($dirsociete as $dirroot)
 
 					// Preview
 					print '<td class="center nowrap">';
-					if ($module->type == 'pdf')
-					{
+					if ($module->type == 'pdf') {
 						$linkspec = '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&token='.newToken().'&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
 					} else {
 						$linkspec = img_object($langs->trans("PreviewNotAvailable"), 'generic');
@@ -659,10 +645,8 @@ $profid['EMAIL'][0] = $langs->trans("EMail");
 $profid['EMAIL'][1] = $langs->trans('Email');
 
 $nbofloop = count($profid);
-foreach ($profid as $key => $val)
-{
-	if ($profid[$key][1] != '-')
-	{
+foreach ($profid as $key => $val) {
+	if ($profid[$key][1] != '-') {
 		print '<tr class="oddeven">';
 		print '<td>'.$profid[$key][0]."</td><td>\n";
 		print $profid[$key][1];
@@ -676,8 +660,7 @@ foreach ($profid as $key => $val)
 		$mandatory = (empty($conf->global->$idprof_mandatory) ?false:true);
 		$invoice_mandatory = (empty($conf->global->$idprof_invoice_mandatory) ?false:true);
 
-		if ($verif)
-		{
+		if ($verif) {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&token='.newToken().'&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
@@ -687,8 +670,7 @@ foreach ($profid as $key => $val)
 			print '</a></td>';
 		}
 
-		if ($mandatory)
-		{
+		if ($mandatory) {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&token='.newToken().'&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
@@ -698,8 +680,7 @@ foreach ($profid as $key => $val)
 			print '</a></td>';
 		}
 
-		if ($invoice_mandatory)
-		{
+		if ($invoice_mandatory) {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&token='.newToken().'&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
@@ -740,8 +721,7 @@ print '<td width="80">&nbsp;</td></tr>'."\n";
 
 print '<tr class="oddeven">';
 print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectCompany"), $langs->trans('UseSearchToSelectCompanyTooltip'), 1).' </td>';
-if (!$conf->use_javascript_ajax)
-{
+if (!$conf->use_javascript_ajax) {
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
@@ -762,8 +742,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td width="80%">'.$form->textwithpicto($langs->trans("DelaiedFullListToSelectContact"), $langs->trans('UseSearchToSelectContactTooltip'), 1).'</td>';
-if (!$conf->use_javascript_ajax)
-{
+if (!$conf->use_javascript_ajax) {
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
@@ -787,8 +766,7 @@ print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddRefInList").'</td>';
 print '<td>&nbsp;</td>';
 print '<td class="center">';
-if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
-{
+if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
@@ -802,8 +780,7 @@ print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddAdressInList").'</td>';
 print '<td>&nbsp;</td>';
 print '<td class="center">';
-if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
-{
+if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
@@ -833,8 +810,7 @@ if (!empty($conf->expedition->enabled)) {
 		print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
 		print '<td>&nbsp;</td>';
 		print '<td class="center">';
-		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
-		{
+		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
 			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 		} else {
@@ -851,8 +827,7 @@ print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("DisableProspectCustomerType").'</td>';
 print '<td>&nbsp;</td>';
 print '<td class="center">';
-if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS))
-{
+if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 16d88142588..d1ffffd6b87 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -36,13 +36,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 = 'societe'; //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -77,8 +81,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -91,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
  /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -104,8 +106,7 @@ if ($action == 'create')
 /* Edition d'un champ optionnel                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print '<br><div id="editattrib"></div>';
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index f98f7ac7ccf..8789427c64b 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -34,10 +34,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $langs->loadLangs(array("companies", "bills", "propal", "orders"));
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
@@ -45,19 +46,27 @@ $search_agenda_label = GETPOST('search_agenda_label');
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'a.datep,a.id';
-if (!$sortorder) $sortorder = 'DESC,DESC';
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendathirdparty'));
@@ -69,20 +78,19 @@ $hookmanager->initHooks(array('agendathirdparty'));
 
 $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Cancel
-	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-	{
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	}
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$actioncode = '';
 		$search_agenda_label = '';
 	}
@@ -96,8 +104,7 @@ if (empty($reshook))
 
 $form = new Form($db);
 
-if ($socid > 0)
-{
+if ($socid > 0) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
@@ -105,10 +112,14 @@ if ($socid > 0)
 	$result = $object->fetch($socid);
 
 	$title = $langs->trans("Agenda");
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+		$title = $object->name." - ".$title;
+	}
 	llxHeader('', $title);
 
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 	$head = societe_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'agenda', $langs->trans("ThirdParty"), -1, 'company');
@@ -137,29 +148,31 @@ if ($socid > 0)
 
 	$out = '';
 	$permok = $user->rights->agenda->myactions->create;
-	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-	{
-		if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') $out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '').'&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objthirdparty->id > 0 ? '?socid='.$objthirdparty->id : ''));
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {
+			$out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '').'&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objthirdparty->id > 0 ? '?socid='.$objthirdparty->id : ''));
+		}
 		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;percentage=-1';
 		$out .= '&amp;datep='.dol_print_date(dol_now(), 'dayhourlog');
 	}
 
 	$newcardbutton = '';
-	if (!empty($conf->agenda->enabled))
-	{
-		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-		{
+	if (!empty($conf->agenda->enabled)) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 		}
 	}
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		print '<br>';
 
 		$param = '&socid='.$socid;
-		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage='.$contextpage;
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.$limit;
+		}
 
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
 		//print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index a56fa0d9f81..ba33386f360 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -22,12 +22,24 @@
  *       \brief      File to return Ajax response on thirdparty list request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
 
 require '../../main.inc.php';
 
@@ -48,16 +60,14 @@ $showtype = GETPOST('showtype', 'int');
 dol_syslog(join(',', $_GET));
 //print_r($_GET);
 
-if (!empty($action) && $action == 'fetch' && !empty($id))
-{
+if (!empty($action) && $action == 'fetch' && !empty($id)) {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 	$outjson = array();
 
 	$object = new Societe($db);
 	$ret = $object->fetch($id);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$outref = $object->ref;
 		$outname = $object->name;
 		$outdesc = '';
@@ -74,7 +84,9 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 
 	top_httphead();
 
-	if (empty($htmlname)) return;
+	if (empty($htmlname)) {
+		return;
+	}
 
 	$match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
 	sort($match);
@@ -83,12 +95,18 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	// When used from jQuery, the search term is added as GET param "term".
 	$searchkey = (($id && GETPOST($id, 'alpha')) ?GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ?GETPOST($htmlname, 'alpha') : ''));
 
-	if (!$searchkey) return;
+	if (!$searchkey) {
+		return;
+	}
 
-	if (!is_object($form)) $form = new Form($db);
+	if (!is_object($form)) {
+		$form = new Form($db);
+	}
 	$arrayresult = $form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson);
 
 	$db->close();
 
-	if ($outjson) print json_encode($arrayresult);
+	if ($outjson) {
+		print json_encode($arrayresult);
+	}
 }
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index da7591a419b..3221aafff55 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -23,12 +23,24 @@
  *       \brief      File to return Ajax response on third parties request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
 
 require '../main.inc.php';
 
@@ -50,24 +62,25 @@ dol_syslog(join(',', $_GET));
 
 
 // Generation liste des societes
-if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
-{
+if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn')) {
 	$return_arr = array();
 
 	// Define filter on text typed
 	$socid = $_GET['newcompany'] ? $_GET['newcompany'] : '';
-	if (!$socid) $socid = $_GET['socid'] ? $_GET['socid'] : '';
-	if (!$socid) $socid = $_GET['id_fourn'] ? $_GET['id_fourn'] : '';
+	if (!$socid) {
+		$socid = $_GET['socid'] ? $_GET['socid'] : '';
+	}
+	if (!$socid) {
+		$socid = $_GET['id_fourn'] ? $_GET['id_fourn'] : '';
+	}
 
 	$sql = "SELECT rowid, nom";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= " WHERE s.entity IN (".getEntity('societe').")";
-	if ($socid)
-	{
+	if ($socid) {
 		$sql .= " AND (";
 		// Add criteria on name/code
-		if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
-		{
+		if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) {   // Can use index
 			$sql .= "nom LIKE '".$db->escape($socid)."%'";
 			$sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
 			$sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
@@ -76,7 +89,9 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 			$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
 			$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
 		}
-		if (!empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql .= " OR rowid = '".$db->escape($socid)."'";
+		if (!empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) {
+			$sql .= " OR rowid = '".$db->escape($socid)."'";
+		}
 		$sql .= ")";
 	}
 	//if (GETPOST("filter")) $sql.= " AND (".GETPOST("filter", "alpha").")"; // Add other filters
@@ -84,12 +99,12 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 
 	//dol_syslog("ajaxcompanies", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
-		while ($row = $db->fetch_array($resql))
-		{
+	if ($resql) {
+		while ($row = $db->fetch_array($resql)) {
 			$label = $row['nom'];
-			if ($socid) $label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
+			if ($socid) {
+				$label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
+			}
 			$row_array['label'] = $label;
 			$row_array['value'] = $row['nom'];
 			$row_array['key'] = $row['rowid'];
diff --git a/htdocs/societe/ajaxcountries.php b/htdocs/societe/ajaxcountries.php
index dfc4ffd9015..a4efc4ecc94 100644
--- a/htdocs/societe/ajaxcountries.php
+++ b/htdocs/societe/ajaxcountries.php
@@ -22,12 +22,24 @@
  *       \brief      File to return Ajax response on country request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
 
 require '../main.inc.php';
 
@@ -50,8 +62,7 @@ print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"])
 dol_syslog(join(',', $_POST));
 
 // Generate list of countries
-if (!empty($country))
-{
+if (!empty($country)) {
 	global $langs;
 	$langs->load("dict");
 
@@ -61,11 +72,9 @@ if (!empty($country))
 	$sql .= " ORDER BY label ASC";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		print '<ul>';
-		while ($country = $db->fetch_object($resql))
-		{
+		while ($country = $db->fetch_object($resql)) {
 			print '<li>';
 			// Si traduction existe, on l'utilise, sinon on prend le libellé par défaut
 			print ($country->code && $langs->trans("Country".$country->code) != "Country".$country->code ? $langs->trans("Country".$country->code) : ($country->label != '-' ? $country->label : '&nbsp;'));
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 5686b3660d1..da7e68d4849 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -66,7 +66,9 @@ abstract class ActionsCardCommon
 		//$ret = $this->getInstanceDao();
 
 		$object = new Societe($this->db);
-		if (!empty($id) || !empty($ref)) $object->fetch($id, $ref);
+		if (!empty($id) || !empty($ref)) {
+			$object->fetch($id, $ref);
+		}
 		$this->object = $object;
 	}
 
@@ -85,26 +87,37 @@ abstract class ActionsCardCommon
 		global $conf, $langs, $db, $user, $mysoc, $canvas;
 		global $form, $formadmin, $formcompany;
 
-		if ($action == 'add' || $action == 'update') $this->assign_post($action);
+		if ($action == 'add' || $action == 'update') {
+			$this->assign_post($action);
+		}
 
-		if ($_GET["type"] == 'f') { $this->object->fournisseur = 1; }
-		if ($_GET["type"] == 'c') { $this->object->client = 1; }
-		if ($_GET["type"] == 'p') { $this->object->client = 2; }
-		if ($_GET["type"] == 'cp') { $this->object->client = 3; }
-		if ($_REQUEST["private"] == 1) { $this->object->particulier = 1; }
+		if ($_GET["type"] == 'f') {
+			$this->object->fournisseur = 1;
+		}
+		if ($_GET["type"] == 'c') {
+			$this->object->client = 1;
+		}
+		if ($_GET["type"] == 'p') {
+			$this->object->client = 2;
+		}
+		if ($_GET["type"] == 'cp') {
+			$this->object->client = 3;
+		}
+		if ($_REQUEST["private"] == 1) {
+			$this->object->particulier = 1;
+		}
 
-		foreach ($this->object as $key => $value)
-		{
+		foreach ($this->object as $key => $value) {
 			$this->tpl[$key] = $value;
 		}
 
 		$this->tpl['error'] = get_htmloutput_errors($this->object->error, $this->object->errors);
-		if (is_array($GLOBALS['errors'])) $this->tpl['error'] = get_htmloutput_mesg('', $GLOBALS['errors'], 'error');
+		if (is_array($GLOBALS['errors'])) {
+			$this->tpl['error'] = get_htmloutput_mesg('', $GLOBALS['errors'], 'error');
+		}
 
-		if ($action == 'create')
-		{
-			if ($conf->use_javascript_ajax)
-			{
+		if ($action == 'create') {
+			if ($conf->use_javascript_ajax) {
 				$this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
 		              $("#radiocompany").click(function() {
@@ -124,10 +137,8 @@ abstract class ActionsCardCommon
 			}
 		}
 
-		if ($action == 'create' || $action == 'edit')
-		{
-			if ($conf->use_javascript_ajax)
-			{
+		if ($action == 'create' || $action == 'edit') {
+			if ($conf->use_javascript_ajax) {
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				$(document).ready(function () {
 						$("#selectcountry_id").change(function() {
@@ -141,20 +152,22 @@ abstract class ActionsCardCommon
 
 			// Load object modCodeClient
 			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-			{
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$modCodeClient = new $module($db);
 			$this->tpl['auto_customercode'] = $modCodeClient->code_auto;
 			// We verified if the tag prefix is used
-			if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
+			if ($modCodeClient->code_auto) {
+				$this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
+			}
 
 			// TODO create a function
 			$this->tpl['select_customertype'] = Form::selectarray('client', array(
@@ -166,36 +179,41 @@ abstract class ActionsCardCommon
 
 			// Customer
 			$this->tpl['customercode'] = $this->object->code_client;
-			if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) $this->tpl['customercode'] = $modCodeClient->getNextValue($this->object, 0);
+			if ((!$this->object->code_client || $this->object->code_client == -1) && $modCodeClient->code_auto) {
+				$this->tpl['customercode'] = $modCodeClient->getNextValue($this->object, 0);
+			}
 			$this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
 			$s = $modCodeClient->getToolTip($langs, $this->object, 0);
 			$this->tpl['help_customercode'] = $form->textwithpicto('', $s, 1);
 
-			if (!empty($conf->fournisseur->enabled))
-			{
+			if (!empty($conf->fournisseur->enabled)) {
 				$this->tpl['supplier_enabled'] = 1;
 
 				// Load object modCodeFournisseur
 				$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
-				if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-				{
+				if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 					$module = substr($module, 0, dol_strlen($module) - 4);
 				}
 				$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-				foreach ($dirsociete as $dirroot)
-				{
+				foreach ($dirsociete as $dirroot) {
 					$res = dol_include_once($dirroot.$module.'.php');
-					if ($res) break;
+					if ($res) {
+						break;
+					}
 				}
 				$modCodeFournisseur = new $module;
 				$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
 				// We verified if the tag prefix is used
-				if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
+				if ($modCodeFournisseur->code_auto) {
+					$this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
+				}
 
 				// Supplier
 				$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur", $this->object->fournisseur, 1);
 				$this->tpl['suppliercode'] = $this->object->code_fournisseur;
-				if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object, 1);
+				if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) {
+					$this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object, 1);
+				}
 				$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
 				$s = $modCodeFournisseur->getToolTip($langs, $this->object, 1);
 				$this->tpl['help_suppliercode'] = $form->textwithpicto('', $s, 1);
@@ -216,14 +234,21 @@ abstract class ActionsCardCommon
 			$this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
 			$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-			if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				$this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 
 			// State
-			if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
-			else $this->tpl['select_state'] = $countrynotdefined;
+			if ($this->object->country_id) {
+				$this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
+			} else {
+				$this->tpl['select_state'] = $countrynotdefined;
+			}
 
 			// Language
-			if (!empty($conf->global->MAIN_MULTILANGS)) $this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang ? $this->object->default_lang : $conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1);
+			if (!empty($conf->global->MAIN_MULTILANGS)) {
+				$this->tpl['select_lang'] = $formadmin->select_language(($this->object->default_lang ? $this->object->default_lang : $conf->global->MAIN_LANG_DEFAULT), 'default_lang', 0, 0, 1);
+			}
 
 			// VAT
 			$this->tpl['yn_assujtva'] = $form->selectyesno('assujtva_value', $this->tpl['tva_assuj'], 1); // Assujeti par defaut en creation
@@ -233,24 +258,20 @@ abstract class ActionsCardCommon
 
 			// Local Tax
 			// TODO mettre dans une classe propre au pays
-			if ($mysoc->country_code == 'ES')
-			{
+			if ($mysoc->country_code == 'ES') {
 				$this->tpl['localtax'] = '';
 
-				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-				{
+				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td>';
 					$this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
 					$this->tpl['localtax'] .= '</td><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td>';
 					$this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
 					$this->tpl['localtax'] .= '</td></tr>';
-				} elseif ($mysoc->localtax1_assuj == "1")
-				{
+				} elseif ($mysoc->localtax1_assuj == "1") {
 					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td><td colspan="3">';
 					$this->tpl['localtax'] .= $form->selectyesno('localtax1assuj_value', $this->object->localtax1_assuj, 1);
 					$this->tpl['localtax'] .= '</td><tr>';
-				} elseif ($mysoc->localtax2_assuj == "1")
-				{
+				} elseif ($mysoc->localtax2_assuj == "1") {
 					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td><td colspan="3">';
 					$this->tpl['localtax'] .= $form->selectyesno('localtax2assuj_value', $this->object->localtax1_assuj, 1);
 					$this->tpl['localtax'] .= '</td><tr>';
@@ -269,7 +290,9 @@ abstract class ActionsCardCommon
 			$this->tpl['address'] = dol_nl2br($this->object->address);
 
 			$img = picto_from_langcode($this->object->country_code);
-			if ($this->object->isInEEC()) $this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 0);
+			if ($this->object->isInEEC()) {
+				$this->tpl['country'] = $form->textwithpicto(($img ? $img.' ' : '').$this->object->country, $langs->trans("CountryIsInEEC"), 1, 0);
+			}
 			$this->tpl['country'] = ($img ? $img.' ' : '').$this->object->country;
 
 			$this->tpl['phone'] 	= dol_print_phone($this->object->phone, $this->object->country_code, 0, $this->object->id, 'AC_TEL');
@@ -283,8 +306,7 @@ abstract class ActionsCardCommon
 			$arr = $formcompany->typent_array(1);
 			$this->tpl['typent'] = $arr[$this->object->typent_code];
 
-			if (!empty($conf->global->MAIN_MULTILANGS))
-			{
+			if (!empty($conf->global->MAIN_MULTILANGS)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				//$s=picto_from_langcode($this->default_lang);
 				//print ($s?$s.' ':'');
@@ -300,31 +322,31 @@ abstract class ActionsCardCommon
 			$this->tpl['sales_representatives'] = '';
 			$listsalesrepresentatives = $this->object->getSalesRepresentatives($user);
 			$nbofsalesrepresentative = count($listsalesrepresentatives);
-			if ($nbofsalesrepresentative > 3)   // We print only number
-			{
+			if ($nbofsalesrepresentative > 3) {   // We print only number
 				$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
 			} elseif ($nbofsalesrepresentative > 0) {
 				$userstatic = new User($this->db);
 				$i = 0;
-				foreach ($listsalesrepresentatives as $val)
-				{
+				foreach ($listsalesrepresentatives as $val) {
 					$userstatic->id = $val['id'];
 					$userstatic->lastname = $val['name'];
 					$userstatic->firstname = $val['firstname'];
 					$this->tpl['sales_representatives'] .= $userstatic->getNomUrl(1);
 					$i++;
-					if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
+					if ($i < $nbofsalesrepresentative) {
+						$this->tpl['sales_representatives'] .= ', ';
+					}
 				}
-			} else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
+			} else {
+				$this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
+			}
 
 			// Linked member
-			if (!empty($conf->adherent->enabled))
-			{
+			if (!empty($conf->adherent->enabled)) {
 				$langs->load("members");
 				$adh = new Adherent($this->db);
 				$result = $adh->fetch('', '', $this->object->id);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$adh->ref = $adh->getFullName($langs);
 					$this->tpl['linked_member'] = $adh->getNomUrl(1);
 				} else {
@@ -334,22 +356,18 @@ abstract class ActionsCardCommon
 
 			// Local Tax
 			// TODO mettre dans une classe propre au pays
-			if ($mysoc->country_code == 'ES')
-			{
+			if ($mysoc->country_code == 'ES') {
 				$this->tpl['localtax'] = '';
 
-				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-				{
+				if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
 					$this->tpl['localtax'] .= '<td>'.yn($this->object->localtax1_assuj).'</td>';
 					$this->tpl['localtax'] .= '<td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
 					$this->tpl['localtax'] .= '<td>'.yn($this->object->localtax2_assuj).'</td></tr>';
-				} elseif ($mysoc->localtax1_assuj == "1")
-				{
+				} elseif ($mysoc->localtax1_assuj == "1") {
 					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax1IsUsedES").'</td>';
 					$this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax1_assuj).'</td></tr>';
-				} elseif ($mysoc->localtax2_assuj == "1")
-				{
+				} elseif ($mysoc->localtax2_assuj == "1") {
 					$this->tpl['localtax'] .= '<tr><td>'.$langs->trans("LocalTax2IsUsedES").'</td>';
 					$this->tpl['localtax'] .= '<td colspan="3">'.yn($this->object->localtax2_assuj).'</td></tr>';
 				}
@@ -405,8 +423,7 @@ abstract class ActionsCardCommon
 		$this->object->localtax2_assuj		= $_POST["localtax2assuj_value"];
 
 		// We set country_id, and country_code label of the chosen country
-		if ($this->object->country_id)
-		{
+		if ($this->object->country_id) {
 			$tmparray = getCountry($this->object->country_id, 'all', $this->db, $langs, 0);
 			$this->object->country_code = $tmparray['code'];
 			$this->object->country_label = $tmparray['label'];
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 901a2c55a56..c9ebc56533e 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -61,9 +61,15 @@ class ActionsCardCompany extends ActionsCardCommon
 
 		$out = '';
 
-		if ($action == 'view')      $out .= $langs->trans("ThirdParty");
-		if ($action == 'edit')      $out .= $langs->trans("EditCompany");
-		if ($action == 'create')    $out .= $langs->trans("NewCompany");
+		if ($action == 'view') {
+			$out .= $langs->trans("ThirdParty");
+		}
+		if ($action == 'edit') {
+			$out .= $langs->trans("EditCompany");
+		}
+		if ($action == 'create') {
+			$out .= $langs->trans("NewCompany");
+		}
 
 		return $out;
 	}
@@ -95,8 +101,7 @@ class ActionsCardCompany extends ActionsCardCommon
 		$this->tpl['profid3'] 	= $this->object->idprof3;
 		$this->tpl['profid4'] 	= $this->object->idprof4;
 
-		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK))
-		{
+		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK)) {
 			$js = "\n";
 			$js .= '<script language="JavaScript" type="text/javascript">';
 			$js .= "function CheckVAT(a) {\n";
@@ -107,10 +112,8 @@ class ActionsCardCompany extends ActionsCardCommon
 			$this->tpl['js_checkVatPopup'] = $js;
 		}
 
-		if ($action == 'create' || $action == 'edit')
-		{
-			for ($i = 1; $i <= 4; $i++)
-			{
+		if ($action == 'create' || $action == 'edit') {
+			for ($i = 1; $i <= 4; $i++) {
 				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i, $this->object->country_code);
 				$this->tpl['showprofid'.$i]		= $formcompany->get_input_id_prof($i, 'idprof'.$i, $this->tpl['profid'.$i], $this->object->country_code);
 			}
@@ -126,12 +129,10 @@ class ActionsCardCompany extends ActionsCardCommon
 
 			// VAT intra
 			$s = '<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
-			if (empty($conf->global->MAIN_DISABLEVATCHECK))
-			{
+			if (empty($conf->global->MAIN_DISABLEVATCHECK)) {
 				$s .= ' ';
 
-				if ($conf->use_javascript_ajax)
-				{
+				if ($conf->use_javascript_ajax) {
 					$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 					$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
 				} else {
@@ -142,29 +143,24 @@ class ActionsCardCompany extends ActionsCardCommon
 			}
 		} else {
 			// Confirm delete third party
-			if ($action == 'delete')
-			{
+			if ($action == 'delete') {
 				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "1,action-delete");
 			}
 
-			for ($i = 1; $i <= 4; $i++)
-			{
+			for ($i = 1; $i <= 4; $i++) {
 				$this->tpl['langprofid'.$i]		= $langs->transcountry('ProfId'.$i, $this->object->country_code);
 				$this->tpl['checkprofid'.$i]	= $this->object->id_prof_check($i, $this->object);
 				$this->tpl['urlprofid'.$i] = $this->object->id_prof_url($i, $this->object);
 			}
 
 			// TVA intra
-			if ($this->object->tva_intra)
-			{
+			if ($this->object->tva_intra) {
 				$s = $this->object->tva_intra;
 				$s .= '<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
-				if (empty($conf->global->MAIN_DISABLEVATCHECK))
-				{
+				if (empty($conf->global->MAIN_DISABLEVATCHECK)) {
 					$s .= ' &nbsp; ';
 
-					if ($conf->use_javascript_ajax)
-					{
+					if ($conf->use_javascript_ajax) {
 						$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 						$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
 					} else {
@@ -178,8 +174,7 @@ class ActionsCardCompany extends ActionsCardCommon
 			}
 
 			// Parent company
-			if ($this->object->parent)
-			{
+			if ($this->object->parent) {
 				$socm = new Societe($this->db);
 				$socm->fetch($this->object->parent);
 				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client ? "(".$socm->code_client.")" : "");
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index e79c1cea177..27faac6de12 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -43,7 +42,9 @@ if (empty($conf) || !is_object($conf))
 	<?php echo $this->control->tpl['ajax_selectcountry']; ?>
 <?php } ?>
 
-<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
+<?php if ($this->control->tpl['js_checkVatPopup']) {
+	echo $this->control->tpl['js_checkVatPopup'];
+} ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="POST" name="formsoc">
 
@@ -61,17 +62,17 @@ if (empty($conf) || !is_object($conf))
 	<td><span class="fieldrequired"><?php echo $langs->trans('ThirdPartyName'); ?></span></td>
 	<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
 	<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
-    <td><?php echo $langs->trans('Prefix'); ?></td>
-    <td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
-    <?php } ?>
+	<td><?php echo $langs->trans('Prefix'); ?></td>
+	<td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
+	<?php } ?>
 </tr>
 
 <tr>
 	<td width="25%"><span class="fieldrequired"><?php echo $langs->trans('ProspectCustomer'); ?></span></td>
 	<td width="25%"><?php echo $this->control->tpl['select_customertype']; ?></td>
 
-    <td width="25%"><?php echo $langs->trans('CustomerCode'); ?></td>
-    <td width="25%">
+	<td width="25%"><?php echo $langs->trans('CustomerCode'); ?></td>
+	<td width="25%">
 		<table class="nobordernopadding">
 			<tr>
 				<td><input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15"></td>
@@ -85,14 +86,14 @@ if (empty($conf) || !is_object($conf))
 <tr>
 	<td><span class="fieldrequired"><?php echo $langs->trans('Supplier'); ?></span></td>
 	<td><?php echo $this->control->tpl['yn_supplier']; ?></td>
-    <td><?php echo $langs->trans('SupplierCode'); ?></td>
-    <td>
-    	<table class="nobordernopadding">
-    		<tr>
-    			<td><input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15"></td>
-    			<td><?php echo $this->control->tpl['help_suppliercode']; ?></td>
-    		</tr>
-    	</table>
+	<td><?php echo $langs->trans('SupplierCode'); ?></td>
+	<td>
+		<table class="nobordernopadding">
+			<tr>
+				<td><input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15"></td>
+				<td><?php echo $this->control->tpl['help_suppliercode']; ?></td>
+			</tr>
+		</table>
 	</td>
 </tr>
 
@@ -155,15 +156,23 @@ if (!empty($conf->barcode->enabled)) { ?>
 <?php
 for ($i = 1; $i <= 4; $i++) {
 	if ($this->control->tpl['langprofid'.$i] != '-') {
-		if ($i == 1 || $i == 3) echo '<tr>';
+		if ($i == 1 || $i == 3) {
+			echo '<tr>';
+		}
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i == 2 || $i == 4) echo '</tr>';
+		if ($i == 2 || $i == 4) {
+			echo '</tr>';
+		}
 	} else {
-		if ($i == 1 || $i == 3) echo '<tr>';
+		if ($i == 1 || $i == 3) {
+			echo '<tr>';
+		}
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i == 2 || $i == 4) echo '</tr>';
+		if ($i == 2 || $i == 4) {
+			echo '</tr>';
+		}
 	}
 }
 ?>
@@ -194,7 +203,9 @@ for ($i = 1; $i <= 4; $i++) {
 	<td class="nowrap"><?php echo $this->control->tpl['tva_intra']; ?></td>
 </tr>
 
-<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) {
+	echo $this->control->tpl['localtax'];
+} ?>
 
 <?php if ($user->rights->societe->client->voir) { ?>
 <tr>
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 57b8a06b019..1630a1f5d05 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -34,7 +33,9 @@ $contact = $GLOBALS['objcanvas']->control->object;
 <?php echo $this->control->tpl['error']; ?>
 
 <?php echo $this->control->tpl['ajax_selectcountry']; ?>
-<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
+<?php if ($this->control->tpl['js_checkVatPopup']) {
+	echo $this->control->tpl['js_checkVatPopup'];
+} ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id']; ?>" method="POST" name="formsoc">
 <input type="hidden" name="canvas" value="<?php echo $canvas ?>">
@@ -165,15 +166,23 @@ if (!empty($conf->barcode->enabled)) { ?>
 <?php
 for ($i = 1; $i <= 4; $i++) {
 	if ($this->control->tpl['langprofid'.$i] != '-') {
-		if ($i == 1 || $i == 3) echo '<tr>';
+		if ($i == 1 || $i == 3) {
+			echo '<tr>';
+		}
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['showprofid'.$i].'</td>';
-		if ($i == 2 || $i == 4) echo '</tr>';
+		if ($i == 2 || $i == 4) {
+			echo '</tr>';
+		}
 	} else {
-		if ($i == 1 || $i == 3) echo '<tr>';
+		if ($i == 1 || $i == 3) {
+			echo '<tr>';
+		}
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i == 2 || $i == 4) echo '</tr>';
+		if ($i == 2 || $i == 4) {
+			echo '</tr>';
+		}
 	}
 }
 ?>
@@ -209,7 +218,9 @@ for ($i = 1; $i <= 4; $i++) {
 </tr>
 <?php }
 
-if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+if (!empty($this->control->tpl['localtax'])) {
+	echo $this->control->tpl['localtax'];
+} ?>
 
 </table>
 <br>
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index c56e7f9223c..86f95cb8372 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -34,9 +33,15 @@ print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company
 
 ?>
 
-<?php if ($this->control->tpl['error']) echo $this->control->tpl['error']; ?>
-<?php if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?>
-<?php if ($this->control->tpl['js_checkVatPopup']) echo $this->control->tpl['js_checkVatPopup']; ?>
+<?php if ($this->control->tpl['error']) {
+	echo $this->control->tpl['error'];
+} ?>
+<?php if ($this->control->tpl['action_delete']) {
+	echo $this->control->tpl['action_delete'];
+} ?>
+<?php if ($this->control->tpl['js_checkVatPopup']) {
+	echo $this->control->tpl['js_checkVatPopup'];
+} ?>
 
 <table class="border allwidth">
 
@@ -120,20 +125,31 @@ print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company
 <?php
 for ($i = 1; $i <= 4; $i++) {
 	if ($this->control->tpl['langprofid'.$i] != '-') {
-		if ($i == 1 || $i == 3) echo '<tr>';
+		if ($i == 1 || $i == 3) {
+			echo '<tr>';
+		}
 		echo '<td>'.$this->control->tpl['langprofid'.$i].'</td>';
 		echo '<td>'.$this->control->tpl['profid'.$i];
 		if ($this->control->tpl['profid'.$i]) {
-			if ($this->control->tpl['checkprofid'.$i] > 0) echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];
-			else echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+			if ($this->control->tpl['checkprofid'.$i] > 0) {
+				echo ' &nbsp; '.$this->control->tpl['urlprofid'.$i];
+			} else {
+				echo ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+			}
 		}
 		echo '</td>';
-		if ($i == 2 || $i == 4) echo '</tr>';
+		if ($i == 2 || $i == 4) {
+			echo '</tr>';
+		}
 	} else {
-		if ($i == 1 || $i == 3) echo '<tr>';
+		if ($i == 1 || $i == 3) {
+			echo '<tr>';
+		}
 		echo '<td>&nbsp;</td>';
 		echo '<td>&nbsp;</td>';
-		if ($i == 2 || $i == 4) echo '</tr>';
+		if ($i == 2 || $i == 4) {
+			echo '</tr>';
+		}
 	}
 }
 ?>
@@ -145,14 +161,19 @@ for ($i = 1; $i <= 4; $i++) {
 	<td><?php echo $this->control->tpl['tva_intra']; ?></td>
 </tr>
 
-<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) {
+	echo $this->control->tpl['localtax'];
+} ?>
 
 <tr>
 	<td><?php echo $langs->trans('Capital'); ?></td>
 	<td colspan="3">
 	<?php
-	if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);
-	else echo '&nbsp;';
+	if ($this->control->tpl['capital']) {
+		echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency);
+	} else {
+		echo '&nbsp;';
+	}
 	?>
 	</td>
 </tr>
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index cab8a965ee0..244a50fb719 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -61,9 +61,15 @@ class ActionsCardIndividual extends ActionsCardCommon
 
 		$out = '';
 
-		if ($action == 'view')      $out .= $langs->trans("Individual");
-		if ($action == 'edit')      $out .= $langs->trans("EditCompany");
-		if ($action == 'create')    $out .= $langs->trans("NewCompany");
+		if ($action == 'view') {
+			$out .= $langs->trans("Individual");
+		}
+		if ($action == 'edit') {
+			$out .= $langs->trans("EditCompany");
+		}
+		if ($action == 'create') {
+			$out .= $langs->trans("NewCompany");
+		}
 
 		return $out;
 	}
@@ -107,13 +113,11 @@ class ActionsCardIndividual extends ActionsCardCommon
 
 		$this->tpl['title'] = load_fiche_titre($this->getTitle($action));
 
-		if ($action == 'create' || $action == 'edit')
-		{
+		if ($action == 'create' || $action == 'edit') {
 			$this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
 		} else {
 			// Confirm delete third party
-			if ($action == 'delete' || $conf->use_javascript_ajax)
-			{
+			if ($action == 'delete' || $conf->use_javascript_ajax) {
 				$this->tpl['action_delete'] = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$this->object->id, $langs->trans("DeleteAnIndividual"), $langs->trans("ConfirmDeleteIndividual"), "confirm_delete", '', 0, "1,action-delete");
 			}
 		}
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index 649d1bf8aca..92793164936 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -32,15 +31,15 @@ if (empty($conf) || !is_object($conf))
 <?php echo $this->control->tpl['error']; ?>
 
 <?php if ($conf->use_javascript_ajax) { ?>
-    <?php echo $this->control->tpl['ajax_selecttype']; ?>
+	<?php echo $this->control->tpl['ajax_selecttype']; ?>
 <br>
-    <?php echo $langs->trans("ThirdPartyType") ?>: &nbsp;
+	<?php echo $langs->trans("ThirdPartyType") ?>: &nbsp;
 <input type="radio" id="radiocompany" class="flat" name="private" value="0">
-    <?php echo $langs->trans("CompanyFoundation"); ?> &nbsp; &nbsp;
+	<?php echo $langs->trans("CompanyFoundation"); ?> &nbsp; &nbsp;
 <input type="radio" id="radioprivate" class="flat" name="private" value="1" checked> <?php echo $langs->trans("Individual"); ?> (<?php echo $langs->trans("ToCreateContactWithSameName") ?>)
 <br>
 <br>
-    <?php echo $this->control->tpl['ajax_selectcountry']; ?>
+	<?php echo $this->control->tpl['ajax_selectcountry']; ?>
 <?php } ?>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="POST" name="formsoc">
@@ -80,8 +79,8 @@ if (empty($conf) || !is_object($conf))
 	<td width="25%"><span class="fieldrequired"><?php echo $langs->trans('ProspectCustomer'); ?></span></td>
 	<td width="25%"><?php echo $this->control->tpl['select_customertype']; ?></td>
 
-    <td width="25%"><?php echo $langs->trans('CustomerCode'); ?></td>
-    <td width="25%">
+	<td width="25%"><?php echo $langs->trans('CustomerCode'); ?></td>
+	<td width="25%">
 		<table class="nobordernopadding">
 			<tr>
 				<td><input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15"></td>
@@ -95,23 +94,23 @@ if (empty($conf) || !is_object($conf))
 <tr>
 	<td><span class="fieldrequired"><?php echo $langs->trans('Supplier'); ?></span></td>
 	<td><?php echo $this->control->tpl['yn_supplier']; ?></td>
-    <td><?php echo $langs->trans('SupplierCode'); ?></td>
-    <td>
-    	<table class="nobordernopadding">
-    		<tr>
-    			<td><input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15"></td>
-    			<td><?php echo $this->control->tpl['help_suppliercode']; ?></td>
-    		</tr>
-    	</table>
+	<td><?php echo $langs->trans('SupplierCode'); ?></td>
+	<td>
+		<table class="nobordernopadding">
+			<tr>
+				<td><input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15"></td>
+				<td><?php echo $this->control->tpl['help_suppliercode']; ?></td>
+			</tr>
+		</table>
 	</td>
 </tr>
 
-    <?php if (count($this->control->tpl['suppliercategory']) > 0) { ?>
+	<?php if (count($this->control->tpl['suppliercategory']) > 0) { ?>
 <tr>
 	<td><?php echo $langs->trans('SupplierCategory'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>
 </tr>
-    <?php }
+	<?php }
 }
 
 if (!empty($conf->barcode->enabled)) { ?>
@@ -169,7 +168,9 @@ if (!empty($conf->barcode->enabled)) { ?>
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) {
+	echo $this->control->tpl['localtax'];
+} ?>
 
 <?php if ($user->rights->societe->client->voir) { ?>
 <tr>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index b5f57544c5f..e7d3e8cc8c7 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -173,7 +172,9 @@ if ($this->control->tpl['fournisseur']) {
 	<td colspan="3"><?php echo $this->control->tpl['yn_assujtva']; ?></td>
 </tr>
 
-<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) {
+	echo $this->control->tpl['localtax'];
+} ?>
 
 </table>
 <br>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 0ee2f271312..c7b6e6e70a4 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -32,8 +31,12 @@ $head = societe_prepare_head($object);
 
 print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
 
-if ($this->control->tpl['error']) echo $this->control->tpl['error'];
-if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delete']; ?>
+if ($this->control->tpl['error']) {
+	echo $this->control->tpl['error'];
+}
+if ($this->control->tpl['action_delete']) {
+	echo $this->control->tpl['action_delete'];
+} ?>
 
 <table class="border allwidth">
 
@@ -119,7 +122,9 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
 	<td colspan="3"><?php echo $this->control->tpl['tva_assuj']; ?></td>
 </tr>
 
-<?php if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?>
+<?php if (!empty($this->control->tpl['localtax'])) {
+	echo $this->control->tpl['localtax'];
+} ?>
 
 <tr>
 	<td><?php echo $langs->trans("Type"); ?></td>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 5a7de9d9450..725a5a508b0 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -45,16 +45,32 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->adherent->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+}
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+}
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
+if (! empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
 
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
-if (!empty($conf->adherent->enabled)) $langs->load("members");
-if (!empty($conf->categorie->enabled)) $langs->load("categories");
-if (!empty($conf->incoterm->enabled)) $langs->load("incoterm");
-if (!empty($conf->notification->enabled)) $langs->load("mails");
+if (!empty($conf->adherent->enabled)) {
+	$langs->load("members");
+}
+if (!empty($conf->categorie->enabled)) {
+	$langs->load("categories");
+}
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load("incoterm");
+}
+if (!empty($conf->notification->enabled)) {
+	$langs->load("mails");
+}
 
 $mesg = ''; $error = 0; $errors = array();
 
@@ -64,8 +80,12 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
 
 $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
-if (empty($socid) && $action == 'view') $action = 'create';
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if (empty($socid) && $action == 'view') {
+	$action = 'create';
+}
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
@@ -78,10 +98,11 @@ $socialnetworks = getArrayOfSocialNetworks();
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartycard', 'globalcard'));
 
-if ($socid > 0) $object->fetch($socid);
+if ($socid > 0) {
+	$object->fetch($socid);
+}
 
-if (!($object->id > 0) && $action == 'view')
-{
+if (!($object->id > 0) && $action == 'view') {
 	$langs->load("errors");
 	print($langs->trans('ErrorRecordNotFound'));
 	exit;
@@ -90,8 +111,7 @@ if (!($object->id > 0) && $action == 'view')
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('thirdparty', 'card', $canvas);
@@ -124,39 +144,34 @@ $upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->
 
 $parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
-	if ($cancel)
-	{
+if (empty($reshook)) {
+	if ($cancel) {
 		$action = '';
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 	}
 
-	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer)
-	{
+	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer) {
 		$error = 0;
 		$soc_origin_id = GETPOST('soc_origin', 'int');
 		$soc_origin = new Societe($db);
 
-		if ($soc_origin_id <= 0)
-		{
+		if ($soc_origin_id <= 0) {
 			$langs->load('errors');
 			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->transnoentitiesnoconv('MergeOriginThirdparty')), null, 'errors');
 		} else {
-			if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
-			{
+			if (!$error && $soc_origin->fetch($soc_origin_id) < 1) {
 				setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// TODO Move the merge function into class of object.
 
 				$db->begin();
@@ -172,26 +187,26 @@ if (empty($reshook))
 					'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
 					'model_pdf', 'fk_projet'
 				);
-				foreach ($listofproperties as $property)
-				{
-					if (empty($object->$property)) $object->$property = $soc_origin->$property;
+				foreach ($listofproperties as $property) {
+					if (empty($object->$property)) {
+						$object->$property = $soc_origin->$property;
+					}
 				}
 
 				// Concat some data
 				$listofproperties = array(
 					'note_public', 'note_private'
 				);
-				foreach ($listofproperties as $property)
-				{
+				foreach ($listofproperties as $property) {
 					$object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
 				}
 
 				// Merge extrafields
-				if (is_array($soc_origin->array_options))
-				{
-					foreach ($soc_origin->array_options as $key => $val)
-					{
-						if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+				if (is_array($soc_origin->array_options)) {
+					foreach ($soc_origin->array_options as $key => $val) {
+						if (empty($object->array_options[$key])) {
+							$object->array_options[$key] = $val;
+						}
 					}
 				}
 
@@ -211,8 +226,7 @@ if (empty($reshook))
 				// If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
 				if ($soc_origin->code_client == $object->code_client
 					|| $soc_origin->code_fournisseur == $object->code_fournisseur
-					|| $soc_origin->barcode == $object->barcode)
-				{
+					|| $soc_origin->barcode == $object->barcode) {
 					dol_syslog("We clean customer and supplier code so we will be able to make the update of target");
 					$soc_origin->code_client = '';
 					$soc_origin->code_fournisseur = '';
@@ -222,15 +236,13 @@ if (empty($reshook))
 
 				// Update
 				$result = $object->update($object->id, $user, 0, 1, 1, 'merge');
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
 
 				// Move links
-				if (!$error)
-				{
+				if (!$error) {
 					// This list is also into the api_thirdparties.class.php
 					// TODO Mutualise the list into object societe.class.php
 					$objects = array(
@@ -260,12 +272,10 @@ if (empty($reshook))
 					);
 
 					//First, all core objects must update their tables
-					foreach ($objects as $object_name => $object_file)
-					{
+					foreach ($objects as $object_name => $object_file) {
 						require_once DOL_DOCUMENT_ROOT.$object_file;
 
-						if (!$error && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id))
-						{
+						if (!$error && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id)) {
 							$error++;
 							setEventMessages($db->lasterror(), null, 'errors');
 						}
@@ -273,46 +283,39 @@ if (empty($reshook))
 				}
 
 				// External modules should update their ones too
-				if (!$error)
-				{
+				if (!$error) {
 					$reshook = $hookmanager->executeHooks('replaceThirdparty', array(
 						'soc_origin' => $soc_origin->id,
 						'soc_dest' => $object->id
 					), $object, $action);
 
-					if ($reshook < 0)
-					{
+					if ($reshook < 0) {
 						setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 						$error++;
 					}
 				}
 
 
-				if (!$error)
-				{
+				if (!$error) {
 					$object->context = array('merge'=>1, 'mergefromid'=>$soc_origin->id);
 
 					// Call trigger
 					$result = $object->call_trigger('COMPANY_MODIFY', $user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
 					// End call triggers
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					//We finally remove the old thirdparty
-					if ($soc_origin->delete($soc_origin->id, $user) < 1)
-					{
+					if ($soc_origin->delete($soc_origin->id, $user) < 1) {
 						$error++;
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
 				} else {
@@ -324,27 +327,23 @@ if (empty($reshook))
 		}
 	}
 
-	if (GETPOST('getcustomercode'))
-	{
+	if (GETPOST('getcustomercode')) {
 		// We defined value code_client
 		$_POST["customer_code"] = "Acompleter";
 	}
 
-	if (GETPOST('getsuppliercode'))
-	{
+	if (GETPOST('getsuppliercode')) {
 		// We defined value code_fournisseur
 		$_POST["supplier_code"] = "Acompleter";
 	}
 
-	if ($action == 'set_localtax1')
-	{
+	if ($action == 'set_localtax1') {
 		//obtidre selected del combobox
 		$value = GETPOST('lt1');
 		$object->fetch($socid);
 		$res = $object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
 	}
-	if ($action == 'set_localtax2')
-	{
+	if ($action == 'set_localtax2') {
 		//obtidre selected del combobox
 		$value = GETPOST('lt2');
 		$object->fetch($socid);
@@ -360,39 +359,37 @@ if (empty($reshook))
 		$extrafields->fetch_name_optionals_label($object->table_element);
 
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $object->insertExtraFields('COMPANY_MODIFY');
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 		}
 
-		if ($error) $action = 'edit_extras';
+		if ($error) {
+			$action = 'edit_extras';
+		}
 	}
 
 	// Add new or update third party
 	if ((!GETPOST('getcustomercode') && !GETPOST('getsuppliercode'))
-	&& ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
-	{
+	&& ($action == 'add' || $action == 'update') && $user->rights->societe->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if (!GETPOST('name'))
-		{
+		if (!GETPOST('name')) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('client') < 0)
-		{
+		if (GETPOST('client') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('fournisseur') < 0)
-		{
+		if (GETPOST('fournisseur') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
 			$error++;
 		}
@@ -407,16 +404,15 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
 
-		if (!$error)
-		{
-			if ($action == 'update')
-			{
+		if (!$error) {
+			if ($action == 'update') {
 				$ret = $object->fetch($socid);
 				$object->oldcopy = clone $object;
-			} else $object->canvas = $canvas;
+			} else {
+				$object->canvas = $canvas;
+			}
 
-			if (GETPOST("private", 'int') == 1)	// Ask to create a contact
-			{
+			if (GETPOST("private", 'int') == 1) {	// Ask to create a contact
 				$object->particulier		= GETPOST("private", 'int');
 
 				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
@@ -489,58 +485,57 @@ if (empty($reshook))
 			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
-			if (GETPOSTISSET('accountancy_code_sell')) $object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
-			if (GETPOSTISSET('accountancy_code_buy')) $object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+			if (GETPOSTISSET('accountancy_code_sell')) {
+				$object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+			}
+			if (GETPOSTISSET('accountancy_code_buy')) {
+				$object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+			}
 
 			// Incoterms
-			if (!empty($conf->incoterm->enabled))
-			{
+			if (!empty($conf->incoterm->enabled)) {
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 			}
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 			}
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0)
-			{
+			if ($ret < 0) {
 				 $error++;
 			}
 
 			// Fill array 'array_languages' with data from add form
 			$ret = $object->setValuesForExtraLanguages();
-			if ($ret < 0)
-			{
+			if ($ret < 0) {
 				$error++;
 			}
 			//var_dump($object->array_languages);exit;
 
-			if (GETPOST('deletephoto')) $object->logo = '';
-			elseif (!empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+			if (GETPOST('deletephoto')) {
+				$object->logo = '';
+			} elseif (!empty($_FILES['photo']['name'])) {
+				$object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+			}
 
 			// Check parameters
-			if (!GETPOST('cancel', 'alpha'))
-			{
-				if (!empty($object->email) && !isValidEMail($object->email))
-				{
+			if (!GETPOST('cancel', 'alpha')) {
+				if (!empty($object->email) && !isValidEMail($object->email)) {
 					$langs->load("errors");
 					$error++;
 					setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
 				}
-				if (!empty($object->url) && !isValidUrl($object->url))
-				{
+				if (!empty($object->url) && !isValidUrl($object->url)) {
 					$langs->load("errors");
 					setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
 				}
 				if (!empty($object->webservices_url)) {
 					//Check if has transport, without any the soap client will give error
-					if (strpos($object->webservices_url, "http") === false)
-					{
+					if (strpos($object->webservices_url, "http") === false) {
 						$object->webservices_url = "http://".$object->webservices_url;
 					}
 					if (!isValidUrl($object->webservices_url)) {
@@ -551,8 +546,7 @@ if (empty($reshook))
 
 				// We set country_id, country_code and country for the selected country
 				$object->country_id = GETPOST('country_id') != '' ?GETPOST('country_id') : $mysoc->country_id;
-				if ($object->country_id)
-				{
+				if ($object->country_id) {
 					$tmparray = getCountry($object->country_id, 'all');
 					$object->country_code = $tmparray['code'];
 					$object->country = $tmparray['label'];
@@ -560,29 +554,28 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error)
-		{
-			if ($action == 'add')
-			{
+		if (!$error) {
+			if ($action == 'add') {
 				$error = 0;
 
 				$db->begin();
 
-				if (empty($object->client))      $object->code_client = '';
-				if (empty($object->fournisseur)) $object->code_fournisseur = '';
+				if (empty($object->client)) {
+					$object->code_client = '';
+				}
+				if (empty($object->fournisseur)) {
+					$object->code_fournisseur = '';
+				}
 
 				$result = $object->create($user);
 
-				if ($result >= 0)
-				{
-					if ($object->particulier)
-					{
+				if ($result >= 0) {
+					if ($object->particulier) {
 						dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
 						$contcats = GETPOST('contcats', 'array');
 						$no_email = GETPOST('contact_no_email', 'int');
 						$result = $object->create_individual($user, $no_email, $contcats);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							setEventMessages($object->error, $object->errors, 'errors');
 							$error++;
 						}
@@ -591,8 +584,7 @@ if (empty($reshook))
 					// Links with users
 					$salesreps = GETPOST('commercial', 'array');
 					$result = $object->setSalesRep($salesreps, true);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
@@ -600,8 +592,7 @@ if (empty($reshook))
 					// Customer categories association
 					$custcats = GETPOST('custcats', 'array');
 					$result = $object->setCategories($custcats, 'customer');
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
@@ -609,8 +600,7 @@ if (empty($reshook))
 					// Supplier categories association
 					$suppcats = GETPOST('suppcats', 'array');
 					$result = $object->setCategories($suppcats, 'supplier');
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
@@ -618,19 +608,15 @@ if (empty($reshook))
 					// Logo/Photo save
 					$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
 					$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-					if ($file_OK)
-					{
-						if (image_format_supported($_FILES['photo']['name']))
-						{
+					if ($file_OK) {
+						if (image_format_supported($_FILES['photo']['name'])) {
 							dol_mkdir($dir);
 
-							if (@is_dir($dir))
-							{
+							if (@is_dir($dir)) {
 								$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 								$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-								if (!$result > 0)
-								{
+								if (!$result > 0) {
 									$errors[] = "ErrorFailedToSaveFile";
 								} else {
 									// Create thumbs
@@ -639,26 +625,23 @@ if (empty($reshook))
 							}
 						}
 					} else {
-						switch ($_FILES['photo']['error'])
-						{
+						switch ($_FILES['photo']['error']) {
 							case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 							case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 								$errors[] = "ErrorFileSizeTooLarge";
 								break;
-		  					case 3: //uploaded file was only partially uploaded
+							case 3: //uploaded file was only partially uploaded
 								$errors[] = "ErrorFilePartiallyUploaded";
 								break;
 						}
-	                }
+					}
 				} else {
-					if ($result == -3 && in_array('ErrorCustomerCodeAlreadyUsed', $object->errors))
-					{
+					if ($result == -3 && in_array('ErrorCustomerCodeAlreadyUsed', $object->errors)) {
 						$duplicate_code_error = true;
 						$object->code_client = null;
 					}
 
-					if ($result == -3 && in_array('ErrorSupplierCodeAlreadyUsed', $object->errors))
-					{
+					if ($result == -3 && in_array('ErrorSupplierCodeAlreadyUsed', $object->errors)) {
 						$duplicate_code_error = true;
 						$object->code_fournisseur = null;
 					}
@@ -668,7 +651,7 @@ if (empty($reshook))
 					}
 
 					setEventMessages($object->error, $object->errors, 'errors');
-				   	$error++;
+					$error++;
 				}
 
 				if ($result >= 0 && !$error) {
@@ -676,13 +659,18 @@ if (empty($reshook))
 
 					if (!empty($backtopage)) {
 						$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
-						if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
-			   			header("Location: ".$backtopage);
+						if (preg_match('/\?/', $backtopage)) {
+							$backtopage .= '&socid='.$object->id; // Old method
+						}
+						header("Location: ".$backtopage);
 						exit;
 					} else {
 						$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
-						if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
-						elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+						if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+							$url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+						} elseif ($object->fournisseur == 1) {
+							$url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+						}
 
 						header("Location: ".$url);
 						exit;
@@ -693,31 +681,31 @@ if (empty($reshook))
 				}
 			}
 
-			if ($action == 'update')
-			{
+			if ($action == 'update') {
 				$error = 0;
 
-				if (GETPOST('cancel', 'alpha'))
-				{
-					if (!empty($backtopage))
-					{
-			   			header("Location: ".$backtopage);
+				if (GETPOST('cancel', 'alpha')) {
+					if (!empty($backtopage)) {
+						header("Location: ".$backtopage);
 						exit;
 					} else {
-			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
 						exit;
 					}
 				}
 
 				// To not set code if third party is not concerned. But if it had values, we keep them.
-				if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client = '';
-				if (empty($object->fournisseur) && empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur = '';
+				if (empty($object->client) && empty($object->oldcopy->code_client)) {
+					$object->code_client = '';
+				}
+				if (empty($object->fournisseur) && empty($object->oldcopy->code_fournisseur)) {
+					$object->code_fournisseur = '';
+				}
 				//var_dump($object);exit;
 
 				$result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
 
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
@@ -725,20 +713,17 @@ if (empty($reshook))
 				// Links with users
 				$salesreps = GETPOST('commercial', 'array');
 				$result = $object->setSalesRep($salesreps);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 
 				// Prevent thirdparty's emptying if a user hasn't rights $user->rights->categorie->lire (in such a case, post of 'custcats' is not defined)
-				if (!$error && !empty($user->rights->categorie->lire))
-				{
+				if (!$error && !empty($user->rights->categorie->lire)) {
 					// Customer categories association
 					$categories = GETPOST('custcats', 'array');
 					$result = $object->setCategories($categories, 'customer');
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
@@ -746,8 +731,7 @@ if (empty($reshook))
 					// Supplier categories association
 					$categories = GETPOST('suppcats', 'array');
 					$result = $object->setCategories($categories, 'supplier');
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
@@ -756,34 +740,28 @@ if (empty($reshook))
 				// Logo/Photo save
 				$dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
 				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-				if (GETPOST('deletephoto') && $object->logo)
-				{
+				if (GETPOST('deletephoto') && $object->logo) {
 					$fileimg = $dir.'/'.$object->logo;
 					$dirthumbs = $dir.'/thumbs';
 					dol_delete_file($fileimg);
 					dol_delete_dir_recursive($dirthumbs);
 				}
-				if ($file_OK)
-				{
-					if (image_format_supported($_FILES['photo']['name']) > 0)
-					{
+				if ($file_OK) {
+					if (image_format_supported($_FILES['photo']['name']) > 0) {
 						dol_mkdir($dir);
 
-						if (@is_dir($dir))
-						{
+						if (@is_dir($dir)) {
 							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 							$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-							if (!$result > 0)
-							{
+							if (!$result > 0) {
 								$errors[] = "ErrorFailedToSaveFile";
 							} else {
 								// Create thumbs
 								$object->addThumbs($newfile);
 
 								// Index file in database
-								if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
-								{
+								if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD)) {
 									require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 									// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
 									deleteFilesIntoDatabaseIndex(dirname($newfile), '', '');
@@ -796,13 +774,12 @@ if (empty($reshook))
 						$errors[] = "ErrorBadImageFormat";
 					}
 				} else {
-					switch ($_FILES['photo']['error'])
-					{
+					switch ($_FILES['photo']['error']) {
 						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 							$errors[] = "ErrorFileSizeTooLarge";
 							break;
-	  					case 3: //uploaded file was only partially uploaded
+						case 3: //uploaded file was only partially uploaded
 							$errors[] = "ErrorFilePartiallyUploaded";
 							break;
 					}
@@ -811,26 +788,22 @@ if (empty($reshook))
 
 
 				// Update linked member
-				if (!$error && $object->fk_soc > 0)
-				{
+				if (!$error && $object->fk_soc > 0) {
 					$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
 					$sql .= " SET fk_soc = NULL WHERE fk_soc = ".$id;
-					if (!$object->db->query($sql))
-					{
+					if (!$object->db->query($sql)) {
 						$error++;
 						$object->error .= $object->db->lasterror();
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
 
-				if (!$error && !count($errors))
-				{
-					if (!empty($backtopage))
-					{
-			   			header("Location: ".$backtopage);
+				if (!$error && !count($errors)) {
+					if (!empty($backtopage)) {
+						header("Location: ".$backtopage);
 						exit;
 					} else {
-			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
 						exit;
 					}
 				} else {
@@ -844,48 +817,42 @@ if (empty($reshook))
 	}
 
 	// Delete third party
-	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
-	{
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer) {
 		$object->fetch($socid);
 		$object->oldcopy = clone $object;
 		$result = $object->delete($socid, $user);
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
 			exit;
 		} else {
 			$langs->load("errors");
-		   	setEventMessages($object->error, $object->errors, 'errors');
-		   	$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+			$error++;
 			$action = '';
 		}
 	}
 
 	// Set third-party type
-	if ($action == 'set_thirdpartytype' && $user->rights->societe->creer)
-	{
+	if ($action == 'set_thirdpartytype' && $user->rights->societe->creer) {
 		$object->fetch($socid);
 		$result = $object->setThirdpartyType(GETPOST('typent_id', 'int'));
 	}
 
 	// Set incoterm
-	if ($action == 'set_incoterms' && $user->rights->societe->creer && !empty($conf->incoterm->enabled))
-	{
+	if ($action == 'set_incoterms' && $user->rights->societe->creer && !empty($conf->incoterm->enabled)) {
 		$object->fetch($socid);
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	}
 
 	// Set parent company
-	if ($action == 'set_thirdparty' && $user->rights->societe->creer)
-	{
+	if ($action == 'set_thirdparty' && $user->rights->societe->creer) {
 		$object->fetch($socid);
 		$result = $object->set_parent(GETPOST('parent_id', 'int'));
 	}
 
 	// Set sales representatives
-	if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer)
-	{
+	if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer) {
 		$object->fetch($socid);
 		$result = $object->setSalesRep(GETPOST('commercial', 'array'));
 	}
@@ -921,73 +888,81 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formadmin = new FormAdmin($db);
 $formcompany = new FormCompany($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+if (! empty($conf->accounting->enabled)) {
+	$formaccounting = new FormAccounting($db);
+}
 
-if ($socid > 0 && empty($object->id))
-{
+if ($socid > 0 && empty($object->id)) {
 	$result = $object->fetch($socid);
-	if ($result <= 0) dol_print_error('', $object->error);
+	if ($result <= 0) {
+		dol_print_error('', $object->error);
+	}
 }
 
 $title = $langs->trans("ThirdParty");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$langs->trans('Card');
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name." - ".$langs->trans('Card');
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS
 	// -----------------------------------------
-   	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
+	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
 	$objcanvas->display_canvas($action); // Show template
 } else {
 	// -----------------------------------------
 	// When used in standard mode
 	// -----------------------------------------
-	if ($action == 'create')
-	{
+	if ($action == 'create') {
 		/*
-         *  Creation
-         */
+		 *  Creation
+		 */
 		$private = GETPOST("private", "int");
-		if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !GETPOSTISSET('private')) $private = 1;
-		if (empty($private)) $private = 0;
+		if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !GETPOSTISSET('private')) {
+			$private = 1;
+		}
+		if (empty($private)) {
+			$private = 0;
+		}
 
 		// Load object modCodeTiers
 		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-		{
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 			$module = substr($module, 0, dol_strlen($module) - 4);
 		}
 		$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-		foreach ($dirsociete as $dirroot)
-		{
+		foreach ($dirsociete as $dirroot) {
 			$res = dol_include_once($dirroot.$module.'.php');
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 		$modCodeClient = new $module;
 		// Load object modCodeFournisseur
 		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-		{
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 			$module = substr($module, 0, dol_strlen($module) - 4);
 		}
 		$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-		foreach ($dirsociete as $dirroot)
-		{
+		foreach ($dirsociete as $dirroot) {
 			$res = dol_include_once($dirroot.$module.'.php');
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 		$modCodeFournisseur = new $module;
 
 		// Define if customer/prospect or supplier status is set or not
-		if (GETPOST("type") != 'f')
-		{
+		if (GETPOST("type") != 'f') {
 			$object->client = -1;
-			if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) { $object->client = 3; }
+			if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) {
+				$object->client = 3;
+			}
 		}
 		// Prospect / Customer
 		if (GETPOST("type") == 'c') {
@@ -997,8 +972,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				$object->client = 3;
 			}
 		}
-		if (GETPOST("type") == 'p') { $object->client = 2; }
-		if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) { $object->fournisseur = 1; }
+		if (GETPOST("type") == 'p') {
+			$object->client = 2;
+		}
+		if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) {
+			$object->fournisseur = 1;
+		}
 
 		$object->name = GETPOST('name', 'alphanohtml');
 		$object->name_alias = GETPOST('name_alias', 'alphanohtml');
@@ -1062,27 +1041,27 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$object->commercial_id = GETPOST('commercial_id', 'int');
 		$object->default_lang = GETPOST('default_lang');
 
-		if (GETPOSTISSET('accountancy_code_sell')) $object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
-		if (GETPOSTISSET('accountancy_code_buy')) $object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+		if (GETPOSTISSET('accountancy_code_sell')) {
+			$object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+		}
+		if (GETPOSTISSET('accountancy_code_buy')) {
+			$object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+		}
 
 		$object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
 
 		// Gestion du logo de la société
 		$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
 		$file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
-		if ($file_OK)
-		{
-			if (image_format_supported($_FILES['photo']['name']))
-			{
+		if ($file_OK) {
+			if (image_format_supported($_FILES['photo']['name'])) {
 				dol_mkdir($dir);
 
-				if (@is_dir($dir))
-				{
+				if (@is_dir($dir)) {
 					$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 					$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-					if (!$result > 0)
-					{
+					if (!$result > 0) {
 						$errors[] = "ErrorFailedToSaveFile";
 					} else {
 						// Create thumbs
@@ -1094,8 +1073,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// We set country_id, country_code and country for the selected country
 		$object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
-		if ($object->country_id)
-		{
+		if ($object->country_id) {
 			$tmparray = getCountry($object->country_id, 'all');
 			$object->country_code = $tmparray['code'];
 			$object->country = $tmparray['label'];
@@ -1232,7 +1210,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<input type="hidden" name="type" value='.GETPOST("type", 'alpha').'>';
 		print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
 		print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
-		if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+		if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) {
+			print '<input type="hidden" name="code_auto" value="1">';
+		}
 
 		print dol_get_fiche_head(null, 'card', '', 0, '');
 
@@ -1249,17 +1229,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
 		print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
 		print '</td>';
-		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-		{
+		if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 			print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'"></td>';
 		}
 		print '</tr>';
 
 		// If javascript on, we show option individual
-		if ($conf->use_javascript_ajax)
-		{
-			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
-			{
+		if ($conf->use_javascript_ajax) {
+			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
 				// Firstname
 				print '<tr class="individualline"><td>'.$form->editfieldkey('FirstName', 'firstname', '', $object, 0).'</td>';
 				print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.dol_escape_htmltag($object->firstname).'"></td>';
@@ -1283,12 +1260,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print $formcompany->selectProspectCustomerType($selected);
 		print '</td>';
 
-		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		if ($conf->browser->layout == 'phone') {
+			print '</tr><tr>';
+		}
 
 		print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
 		print '<table class="nobordernopadding"><tr><td>';
 		$tmpcode = $object->code_client;
-		if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
+		if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
+			$tmpcode = $modCodeClient->getNextValue($object, 0);
+		}
 		print '<input type="text" name="customer_code" id="customer_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
 		print '</td><td>';
 		$s = $modCodeClient->getToolTip($langs, $object, 0);
@@ -1297,30 +1278,33 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-			|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
-		{
+			|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire))) {
 			// Supplier
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
 			$default = -1;
-			if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1;
+			if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) {
+				$default = 1;
+			}
 			print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0), 1);
 			print '</td>';
 
 
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') {
+				print '</tr><tr>';
+			}
 
 			print '<td>';
-			if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-			{
+			if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire)) {
 				print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
 			}
 			print '</td><td>';
-			if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-			{
+			if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire)) {
 				print '<table class="nobordernopadding"><tr><td>';
 				$tmpcode = $object->code_fournisseur;
-				if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
+				if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
+					$tmpcode = $modCodeFournisseur->getNextValue($object, 1);
+				}
 				print '<input type="text" name="supplier_code" id="supplier_code" class="maxwidthonsmartphone" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
 				print '</td><td>';
 				$s = $modCodeFournisseur->getToolTip($langs, $object, 1);
@@ -1336,8 +1320,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// Barcode
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
 			print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
 			print '</td></tr>';
@@ -1358,7 +1341,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
 		print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100');
 		print '</td>';
-		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		if ($conf->browser->layout == 'phone') {
+			print '</tr><tr>';
+		}
 		print '<td class="tdtop">'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
 		print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
 		print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
@@ -1368,28 +1353,33 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
 		print img_picto('', 'globe-americas', 'class="paddingrightonly"');
 		print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 maxwidth500 widthcentpercentminusx');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 		print '</td></tr>';
 
 		// State
-		if (empty($conf->global->SOCIETE_DISABLE_STATE))
-		{
-			if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-			{
+		if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+			if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2)) {
 				print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
 			} else {
 				print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
 			}
 
-			if ($object->country_id) print $formcompany->select_state($object->state_id, $object->country_code);
-			else print $countrynotdefined;
+			if ($object->country_id) {
+				print $formcompany->select_state($object->state_id, $object->country_code);
+			} else {
+				print $countrynotdefined;
+			}
 			print '</td></tr>';
 		}
 
 		// Phone / Fax
 		print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
 		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
-		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		if ($conf->browser->layout == 'phone') {
+			print '</tr><tr>';
+		}
 		print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
 		print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
@@ -1397,7 +1387,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', empty($conf->global->SOCIETE_EMAIL_MANDATORY) ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
 		print '<td'.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.img_picto('', 'object_email').' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td>';
 		if (!empty($conf->mailing->enabled) && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') {
+				print '</tr><tr>';
+			}
 			print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email') .' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
 			print '<td class="individualline" '.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ?GETPOST("contact_no_email", 'alpha') : $object->no_email), 1, false, 1).'</td>';
 		}
@@ -1427,26 +1419,34 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			if ($idprof != '-')	{
 				$key = 'idprof'.$i;
 
-				if (($j % $NBCOLS) == 0) print '<tr>';
+				if (($j % $NBCOLS) == 0) {
+					print '<tr>';
+				}
 
 				$idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
 				print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory) ? 0 : 1)).'</td><td>';
 
 				print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
 				print '</td>';
-				if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
+				if (($j % $NBCOLS) == ($NBCOLS - 1)) {
+					print '</tr>';
+				}
 				$j++;
 			}
 			$i++;
 		}
-		if ($NBCOLS > 1 && ($j % 2 == 1)) print '<td colspan="2"></td></tr>';
+		if ($NBCOLS > 1 && ($j % 2 == 1)) {
+			print '<td colspan="2"></td></tr>';
+		}
 
 		// Vat is used
 		print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
 		print '<td>';
 		print $form->selectyesno('assujtva_value', GETPOSTISSET('assujtva_value') ?GETPOST('assujtva_value', 'int') : 1, 1); // Assujeti par defaut en creation
 		print '</td>';
-		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		if ($conf->browser->layout == 'phone') {
+			print '</tr><tr>';
+		}
 		print '<td class="nowrap">'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
 		print '<td class="nowrap">';
 		$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
@@ -1456,7 +1456,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			if (!empty($conf->use_javascript_ajax))	{
 				$widthpopup = 600;
-				if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
+				if (!empty($conf->dol_use_jmobile)) {
+					$widthpopup = 350;
+				}
 				$heightpopup = 400;
 				print "\n";
 				print '<script language="JavaScript" type="text/javascript">';
@@ -1477,22 +1479,21 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Local Taxes
 		//TODO: Place into a function to control showing by country or study better option
-		if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-		{
+		if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 			print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
 			print '</td>';
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') {
+				print '</tr><tr>';
+			}
 			print '<td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 			print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
 			print '</td></tr>';
-		} elseif ($mysoc->localtax1_assuj == "1")
-		{
+		} elseif ($mysoc->localtax1_assuj == "1") {
 			print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td colspan="3">';
 			print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
 			print '</td></tr>';
-		} elseif ($mysoc->localtax2_assuj == "1")
-		{
+		} elseif ($mysoc->localtax2_assuj == "1") {
 			print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td colspan="3">';
 			print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
 			print '</td></tr>';
@@ -1502,19 +1503,24 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'."\n";
 		$sortparam = (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), $object->typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
-		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 		print '</td>';
-		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+		if ($conf->browser->layout == 'phone') {
+			print '</tr><tr>';
+		}
 		print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
 		print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
-		if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 		print '</td></tr>';
 
 		// Legal Form
 		print '<tr><td>'.$form->editfieldkey('JuridicalStatus', 'forme_juridique_code', '', $object, 0).'</td>';
 		print '<td colspan="3" class="maxwidthonsmartphone">';
-		if ($object->country_id)
-		{
+		if ($object->country_id) {
 			print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
 		} else {
 			print $countrynotdefined;
@@ -1526,8 +1532,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<td colspan="3"><input type="text" name="capital" id="capital" class="maxwidth100" value="'.$object->capital.'"> ';
 		print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
 
-		if (!empty($conf->global->MAIN_MULTILANGS))
-		{
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
 			print $formadmin->select_language(GETPOST('default_lang', 'alpha') ? GETPOST('default_lang', 'alpha') : ($object->default_lang ? $object->default_lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
 			print '</td>';
@@ -1535,8 +1540,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Incoterms
-		if (!empty($conf->incoterm->enabled))
-		{
+		if (!empty($conf->incoterm->enabled)) {
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
 			print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -1545,8 +1549,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			$langs->load('categories');
 
 			// Customer
@@ -1557,16 +1560,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print "</td></tr>";
 			//}
 
-			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
-			{
+			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
 				print '<tr class="individualline"><td class="toptd">'.$form->editfieldkey('ContactCategoriesShort', 'contcats', '', $object, 0).'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, 'parent', null, null, 1);
 				print img_picto('', 'category').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
-			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION))
-			{
+			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
 				print '<tr class="individualline"><td class="toptd">'.$form->editfieldkey('ContactCategoriesShort', 'contcats', '', $object, 0).'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, 'parent', null, null, 1);
 				print img_picto('', 'category').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
@@ -1583,8 +1584,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -1620,8 +1620,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 			print '<table class="border" width="100%">';
 
-			if (! empty($conf->accounting->enabled))
-			{
+			if (! empty($conf->accounting->enabled)) {
 				// Accountancy_code_sell
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td>';
@@ -1635,8 +1634,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 				print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, '');
 				print '</td></tr>';
-			}
-			else // For external software
+			} else // For external software
 			{
 				// Accountancy_code_sell
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1656,8 +1654,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" name="create" value="'.$langs->trans('AddThirdParty').'">';
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			print ' &nbsp; &nbsp; ';
 			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		} else {
@@ -1670,8 +1667,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	} elseif ($action == 'edit') {
 		//print load_fiche_titre($langs->trans("EditCompany"));
 
-		if ($socid)
-		{
+		if ($socid) {
 			$res = $object->fetch_optionals();
 			//if ($res < 0) { dol_print_error($db); exit; }
 
@@ -1679,44 +1675,41 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Load object modCodeTiers
 			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-			{
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$modCodeClient = new $module($db);
 			// We verified if the tag prefix is used
-			if ($modCodeClient->code_auto)
-			{
+			if ($modCodeClient->code_auto) {
 				$prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
 			}
 			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
-			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-			{
+			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-			foreach ($dirsociete as $dirroot)
-			{
+			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot.$module.'.php');
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 			$modCodeFournisseur = new $module($db);
 			// On verifie si la balise prefix est utilisee
-			if ($modCodeFournisseur->code_auto)
-			{
+			if ($modCodeFournisseur->code_auto) {
 				$prefixSupplierIsUsed = $modCodeFournisseur->verif_prefixIsUsed();
 			}
 
 			$object->oldcopy = clone $object;
 
-			if (GETPOSTISSET('name'))
-			{
+			if (GETPOSTISSET('name')) {
 				// We overwrite with values if posted
 				$object->name = GETPOST('name', 'alphanohtml');
 				$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
@@ -1766,12 +1759,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				$object->webservices_url        = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
 				$object->webservices_key        = GETPOST('webservices_key', 'san_alpha');
 
-				if (GETPOSTISSET('accountancy_code_sell')) $object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
-				if (GETPOSTISSET('accountancy_code_buy')) $object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+				if (GETPOSTISSET('accountancy_code_sell')) {
+					$object->accountancy_code_sell  = GETPOST('accountancy_code_sell', 'alpha');
+				}
+				if (GETPOSTISSET('accountancy_code_buy')) {
+					$object->accountancy_code_buy   = GETPOST('accountancy_code_buy', 'alpha');
+				}
 
 				//Incoterms
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 					$object->location_incoterms = GETPOST('lcoation_incoterms', 'alpha');
 				}
@@ -1784,8 +1780,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				$object->localtax2_value		= GETPOST('lt2');
 
 				// We set country_id, and country_code label of the chosen country
-				if ($object->country_id > 0)
-				{
+				if ($object->country_id > 0) {
 					$tmparray = getCountry($object->country_id, 'all');
 					$object->country_code = $tmparray['code'];
 					$object->country = $tmparray['label'];
@@ -1794,13 +1789,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			if ($object->localtax1_assuj == 0) {
 				$sub = 0;
-			} else {$sub = 1; }
+			} else {
+				$sub = 1;
+			}
 			if ($object->localtax2_assuj == 0) {
 				$sub2 = 0;
-			} else {$sub2 = 1; }
+			} else {
+				$sub2 = 1;
+			}
 
-			if ($conf->use_javascript_ajax)
-			{
+			if ($conf->use_javascript_ajax) {
 				print "\n".'<script type="text/javascript">';
 				print '$(document).ready(function () {
     			var val='.$sub.';
@@ -1882,7 +1880,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="socid" value="'.$object->id.'">';
 			print '<input type="hidden" name="entity" value="'.$object->entity.'">';
-			if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
+			if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) {
+				print '<input type="hidden" name="code_auto" value="1">';
+			}
 
 
 			print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company');
@@ -1891,8 +1891,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<table class="border centpercent">';
 
 			// Ref/ID
-			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-			{
+			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
 				print $object->ref;
 				print '</td></tr>';
@@ -1909,12 +1908,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
 			// Prefix
-			if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-			{
+			if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 				print '<tr><td>'.$form->editfieldkey('Prefix', 'prefix', '', $object, 0).'</td><td colspan="3">';
 				// It does not change the prefix mode using the auto numbering prefix
-				if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm)
-				{
+				if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm) {
 					print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
 					print $object->prefix_comm;
 				} else {
@@ -1928,18 +1925,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<td class="maxwidthonsmartphone">';
 			print $formcompany->selectProspectCustomerType($object->client);
 			print '</td>';
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') {
+				print '</tr><tr>';
+			}
 			print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
 
 			print '<table class="nobordernopadding"><tr><td>';
-			if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto)
-			{
+			if ((!$object->code_client || $object->code_client == -1) && $modCodeClient->code_auto) {
 				$tmpcode = $object->code_client;
-				if (empty($tmpcode) && !empty($object->oldcopy->code_client)) $tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-				if (empty($tmpcode) && !empty($modCodeClient->code_auto)) $tmpcode = $modCodeClient->getNextValue($object, 0);
+				if (empty($tmpcode) && !empty($object->oldcopy->code_client)) {
+					$tmpcode = $object->oldcopy->code_client; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+				}
+				if (empty($tmpcode) && !empty($modCodeClient->code_auto)) {
+					$tmpcode = $modCodeClient->getNextValue($object, 0);
+				}
 				print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-			} elseif ($object->codeclient_modifiable())
-			{
+			} elseif ($object->codeclient_modifiable()) {
 				print '<input type="text" name="customer_code" id="customer_code" size="16" value="'.dol_escape_htmltag($object->code_client).'" maxlength="15">';
 			} else {
 				print $object->code_client;
@@ -1954,30 +1955,32 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Supplier
 			if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-				|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire)))
-			{
+				|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire))) {
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td>';
 				print '<td class="maxwidthonsmartphone">';
 				print $form->selectyesno("fournisseur", $object->fournisseur, 1, false, 0, 1);
 				print '</td>';
-				if ($conf->browser->layout == 'phone') print '</tr><tr>';
+				if ($conf->browser->layout == 'phone') {
+					print '</tr><tr>';
+				}
 				print '<td>';
-				if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
-				{
+				if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire)) {
 					print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
 				}
 				print '</td>';
 				print '<td>';
 				print '<table class="nobordernopadding"><tr><td>';
-				if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto)
-				{
+				if ((!$object->code_fournisseur || $object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) {
 					$tmpcode = $object->code_fournisseur;
-					if (empty($tmpcode) && !empty($object->oldcopy->code_fournisseur)) $tmpcode = $object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
-					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) $tmpcode = $modCodeFournisseur->getNextValue($object, 1);
+					if (empty($tmpcode) && !empty($object->oldcopy->code_fournisseur)) {
+						$tmpcode = $object->oldcopy->code_fournisseur; // When there is an error to update a thirdparty, the number for supplier and customer code is kept to old value.
+					}
+					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
+						$tmpcode = $modCodeFournisseur->getNextValue($object, 1);
+					}
 					print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($tmpcode).'" maxlength="15">';
-				} elseif ($object->codefournisseur_modifiable())
-				{
+				} elseif ($object->codefournisseur_modifiable()) {
 					print '<input type="text" name="supplier_code" id="supplier_code" size="16" value="'.dol_escape_htmltag($object->code_fournisseur).'" maxlength="15">';
 				} else {
 					print $object->code_fournisseur;
@@ -1991,8 +1994,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 
 			// Barcode
-			if (!empty($conf->barcode->enabled))
-			{
+			if (!empty($conf->barcode->enabled)) {
 				print '<tr><td class="tdtop">'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
 				print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
 				print '</td></tr>';
@@ -2015,7 +2017,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
 			print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100');
 			print '</td>';
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') {
+				print '</tr><tr>';
+			}
 			print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
 			print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 			print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
@@ -2025,14 +2029,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td colspan="3">';
 			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
 			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 maxwidth500 widthcentpercentminusx');
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 			print '</td></tr>';
 
 			// State
-			if (empty($conf->global->SOCIETE_DISABLE_STATE))
-			{
-				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-				{
+			if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2)) {
 					print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
 				} else {
 					print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
@@ -2045,7 +2049,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Phone / Fax
 			print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
 			print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') {
+				print '</tr><tr>';
+			}
 			print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
 			print '<td>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
@@ -2072,25 +2078,29 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Prof ids
 			$i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
-			while ($i <= 6)
-			{
+			while ($i <= 6) {
 				$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-				if ($idprof != '-')
-				{
+				if ($idprof != '-') {
 					$key = 'idprof'.$i;
 
-					if (($j % $NBCOLS) == 0) print '<tr>';
+					if (($j % $NBCOLS) == 0) {
+						print '<tr>';
+					}
 
 					$idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
 					print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', !(empty($conf->global->$idprof_mandatory) || !$object->isACompany())).'</td><td>';
 					print $formcompany->get_input_id_prof($i, $key, $object->$key, $object->country_code);
 					print '</td>';
-					if (($j % $NBCOLS) == ($NBCOLS - 1)) print '</tr>';
+					if (($j % $NBCOLS) == ($NBCOLS - 1)) {
+						print '</tr>';
+					}
 					$j++;
 				}
 				$i++;
 			}
-			if ($NBCOLS > 0 && $j % 2 == 1) print '<td colspan="2"></td></tr>';
+			if ($NBCOLS > 0 && $j % 2 == 1) {
+				print '<td colspan="2"></td></tr>';
+			}
 
 			// VAT is used
 			print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
@@ -2099,12 +2109,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Local Taxes
 			//TODO: Place into a function to control showing by country or study better option
-			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-			{
+			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 				print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td>';
 				print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
-				if (!isOnlyOneLocalTax(1))
-				{
+				if (!isOnlyOneLocalTax(1)) {
 					print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 					$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 					print '</span>';
@@ -2113,30 +2121,25 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print '</tr><tr>';
 				print '<td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td>';
 				print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
-				if (!isOnlyOneLocalTax(2))
-				{
+				if (!isOnlyOneLocalTax(2)) {
 					print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 					$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
 					print '</span>';
 				}
 				print '</td></tr>';
-			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
-			{
+			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1") {
 				print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax1IsUsed", $mysoc->country_code), 'localtax1assuj_value', '', $object, 0).'</td><td colspan="3">';
 				print $form->selectyesno('localtax1assuj_value', $object->localtax1_assuj, 1);
-				if (!isOnlyOneLocalTax(1))
-				{
+				if (!isOnlyOneLocalTax(1)) {
 					print '<span class="cblt1">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 					$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 					print '</span>';
 				}
 				print '</td></tr>';
-			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
-			{
+			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1") {
 				print '<tr><td>'.$form->editfieldkey($langs->transcountry("LocalTax2IsUsed", $mysoc->country_code), 'localtax2assuj_value', '', $object, 0).'</td><td colspan="3">';
 				print $form->selectyesno('localtax2assuj_value', $object->localtax2_assuj, 1);
-				if (!isOnlyOneLocalTax(2))
-				{
+				if (!isOnlyOneLocalTax(2)) {
 					print '<span class="cblt2">     '.$langs->transcountry("Type", $mysoc->country_code).': ';
 					$formcompany->select_localtax(2, $object->localtax2_value, "lt2");
 					print '</span>';
@@ -2149,14 +2152,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<td colspan="3">';
 			$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-			{
+			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object)) {
 				$s .= ' &nbsp; ';
 
-				if ($conf->use_javascript_ajax)
-				{
+				if ($conf->use_javascript_ajax) {
 					$widthpopup = 600;
-					if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
+					if (!empty($conf->dol_use_jmobile)) {
+						$widthpopup = 350;
+					}
 					$heightpopup = 400;
 					print "\n";
 					print '<script language="JavaScript" type="text/javascript">';
@@ -2178,12 +2181,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Type - Workforce/Staff
 			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
 			print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 			print '</td>';
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') {
+				print '</tr><tr>';
+			}
 			print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
 			print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id, 0, 0, 0, '', 0, 0, 0, '', '', 1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 			print '</td></tr>';
 
 			// Juridical type
@@ -2198,8 +2207,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
 
 			// Default language
-			if (!empty($conf->global->MAIN_MULTILANGS))
-			{
+			if (!empty($conf->global->MAIN_MULTILANGS)) {
 				print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3">'."\n";
 				print $formadmin->select_language($object->default_lang, 'default_lang', 0, 0, 1);
 				print '</td>';
@@ -2207,18 +2215,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 
 			// Incoterms
-			if (!empty($conf->incoterm->enabled))
-			{
+			if (!empty($conf->incoterm->enabled)) {
 				print '<tr>';
-	  				print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
+					print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 				print '</td></tr>';
 			}
 
 			// Categories
-			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-			{
+			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 				// Customer
 				print '<tr class="visibleifcustomer"><td>'.$form->editfieldkey('CustomersCategoriesShort', 'custcats', '', $object, 0).'</td>';
 				print '<td colspan="3">';
@@ -2249,8 +2255,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -2274,13 +2279,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<tr class="hideonsmartphone">';
 			print '<td>'.$form->editfieldkey('Logo', 'photoinput', '', $object, 0).'</td>';
 			print '<td colspan="3">';
-			if ($object->logo) print $form->showphoto('societe', $object);
+			if ($object->logo) {
+				print $form->showphoto('societe', $object);
+			}
 			$caneditfield = 1;
-			if ($caneditfield)
-			{
-				if ($object->logo) print "<br>\n";
+			if ($caneditfield) {
+				if ($object->logo) {
+					print "<br>\n";
+				}
 				print '<table class="nobordernopadding">';
-				if ($object->logo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+				if ($object->logo) {
+					print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+				}
 				//print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
 				print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
 				print '</table>';
@@ -2294,7 +2304,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<td colspan="3" class="maxwidthonsmartphone">';
 			$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, 'AND u.statut = 1', 0, '', '', 0, 1);
 			$arrayselected = GETPOST('commercial', 'array');
-			if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1);
+			if (empty($arrayselected)) {
+				$arrayselected = $object->getSalesRepresentatives($user, 1);
+			}
 			print img_picto('', 'user').$form->multiselectarray('commercial', $userlist, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1);
 			print '</td></tr>';
 
@@ -2304,8 +2316,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print '<br>';
 				print '<table class="border centpercent">';
 
-				if (! empty($conf->accounting->enabled))
-				{
+				if (! empty($conf->accounting->enabled)) {
 					// Accountancy_code_sell
 					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
 					print '<td>';
@@ -2317,8 +2328,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					print '<td>';
 					print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);
 					print '</td></tr>';
-				}
-				else // For external software
+				} else // For external software
 				{
 					// Accountancy_code_sell
 					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -2347,10 +2357,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 	} else {
 		/*
-         * View
-         */
+		 * View
+		 */
 
-		if (!empty($object->id)) $res = $object->fetch_optionals();
+		if (!empty($object->id)) {
+			$res = $object->fetch_optionals();
+		}
 		//if ($res < 0) { dol_print_error($db); exit; }
 
 
@@ -2361,13 +2373,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$formconfirm = '';
 
 		// Confirm delete third party
-		if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)))
-		{
+		if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id, $langs->trans("DeleteACompany"), $langs->trans("ConfirmDeleteCompany"), "confirm_delete", '', 0, "action-delete");
 		}
 
-		if ($action == 'merge')
-		{
+		if ($action == 'merge') {
 			$formquestion = array(
 				array(
 					'name' => 'soc_origin',
@@ -2383,8 +2393,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		// Call Hook formConfirm
 		$parameters = array('formConfirm' => $formconfirm);
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+		if (empty($reshook)) {
+			$formconfirm .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm = $hookmanager->resPrint;
+		}
 
 		// Print form confirm
 		print $formconfirm;
@@ -2408,15 +2421,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '</td></tr>';
 
 		// Prefix
-		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-		{
+		if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 			print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.dol_escape_htmltag($object->prefix_comm).'</td>';
 			print '</tr>';
 		}
 
 		// Customer code
-		if ($object->client)
-		{
+		if ($object->client) {
 			print '<tr><td>';
 			print $langs->trans('CustomerCode');
 			print '</td>';
@@ -2432,8 +2443,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Supplier code
-		if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-		{
+		if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire)) {
 			print '<tr><td>';
 			print $langs->trans('SupplierCode').'</td><td>';
 			print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
@@ -2446,8 +2456,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Barcode
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			print '<tr><td>';
 			print $langs->trans('Gencod').'</td><td>'.showValueWithClipboardCPButton(dol_escape_htmltag($object->barcode));
 			print '</td>';
@@ -2456,20 +2465,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Prof ids
 		$i = 1; $j = 0;
-		while ($i <= 6)
-		{
+		while ($i <= 6) {
 			$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-			if ($idprof != '-')
-			{
+			if ($idprof != '-') {
 				//if (($j % 2) == 0) print '<tr>';
 				print '<tr>';
 				print '<td>'.$idprof.'</td><td>';
 				$key = 'idprof'.$i;
 				print showValueWithClipboardCPButton(dol_escape_htmltag($object->$key));
-				if ($object->$key)
-				{
-					if ($object->id_prof_check($i, $object) > 0) print ' &nbsp; '.$object->id_prof_url($i, $object);
-					else print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+				if ($object->$key) {
+					if ($object->id_prof_check($i, $object) > 0) {
+						print ' &nbsp; '.$object->id_prof_url($i, $object);
+					} else {
+						print ' <font class="error">('.$langs->trans("ErrorWrongValue").')</font>';
+					}
 				}
 				print '</td>';
 				//if (($j % 2) == 1) print '</tr>';
@@ -2485,8 +2494,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		// We don't need them into customer profile.
 		// Except for spain and localtax where localtax depends on buyer and not seller
 
-		if ($object->fournisseur)
-		{
+		if ($object->fournisseur) {
 			// VAT is used
 			print '<tr><td>';
 			print $form->textwithpicto($langs->trans('VATIsUsed'), $langs->trans('VATIsUsedWhenSelling'));
@@ -2497,24 +2505,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Local Taxes
-		if ($object->fournisseur || $mysoc->country_code == 'ES')
-		{
-			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-			{
+		if ($object->fournisseur || $mysoc->country_code == 'ES') {
+			if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 				print yn($object->localtax1_assuj);
 				print '</td></tr><tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 				print yn($object->localtax2_assuj);
 				print '</td></tr>';
 
-				if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
-				{
+				if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1))) {
 					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 					print '<input type="hidden" name="action" value="set_localtax1">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
 					print '<tr><td>'.$langs->transcountry("Localtax1", $mysoc->country_code).' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editRE&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</td>';
-					if ($action == 'editRE')
-					{
+					if ($action == 'editRE') {
 						print '<td class="left">';
 						$formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 						print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
@@ -2523,8 +2527,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					}
 					print '</tr></form>';
 				}
-				if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
-				{
+				if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2))) {
 					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 					print '<input type="hidden" name="action" value="set_localtax2">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2538,13 +2541,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					}
 					print '</tr></form>';
 				}
-			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
-			{
+			} elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 				print yn($object->localtax1_assuj);
 				print '</td></tr>';
-				if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1)))
-				{
+				if ($object->localtax1_assuj == "1" && (!isOnlyOneLocalTax(1))) {
 					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 					print '<input type="hidden" name="action" value="set_localtax1">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2558,13 +2559,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					}
 					print '</tr></form>';
 				}
-			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
-			{
+			} elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1") {
 				print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 				print yn($object->localtax2_assuj);
 				print '</td></tr>';
-				if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2)))
-				{
+				if ($object->localtax2_assuj == "1" && (!isOnlyOneLocalTax(2))) {
 					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'">';
 					print '<input type="hidden" name="action" value="set_localtax2">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2584,20 +2583,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		// Sale tax code (VAT code)
 		print '<tr>';
 		print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>';
-		if ($object->tva_intra)
-		{
+		if ($object->tva_intra) {
 			$s = '';
 			$s .= dol_escape_htmltag($object->tva_intra);
 			$s .= '<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
 
-			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object))
-			{
+			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object)) {
 				$s .= ' &nbsp; ';
 
-				if ($conf->use_javascript_ajax)
-				{
+				if ($conf->use_javascript_ajax) {
 					$widthpopup = 600;
-					if (!empty($conf->dol_use_jmobile)) $widthpopup = 350;
+					if (!empty($conf->dol_use_jmobile)) {
+						$widthpopup = 350;
+					}
 					$heightpopup = 400;
 					print "\n";
 					print '<script language="JavaScript" type="text/javascript">';
@@ -2621,7 +2619,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		// Third-Party Type
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('ThirdPartyType').'</td>';
-		if ($action != 'editthirdpartytype' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdpartytype&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		if ($action != 'editthirdpartytype' && $user->rights->societe->creer) {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdpartytype&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		$html_name = ($action == 'editthirdpartytype') ? 'typent_id' : 'none';
@@ -2640,8 +2640,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<table class="border tableforfield" width="100%">';
 
 		// Tags / categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			// Customer
 			if ($object->prospect || $object->client || (!$object->fournisseur && !empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
 				print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
@@ -2664,13 +2663,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		// Capital
 		print '<tr><td>'.$langs->trans('Capital').'</td><td>';
-		if ($object->capital) print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
-		else print '&nbsp;';
+		if ($object->capital) {
+			print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
+		} else {
+			print '&nbsp;';
+		}
 		print '</td></tr>';
 
 		// Default language
-		if (!empty($conf->global->MAIN_MULTILANGS))
-		{
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
 			//$s=picto_from_langcode($object->default_lang);
@@ -2682,15 +2683,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Incoterms
-		if (!empty($conf->incoterm->enabled))
-		{
+		if (!empty($conf->incoterm->enabled)) {
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans('IncotermLabel').'</td>';
-			if ($action != 'editincoterm' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a></td>';
+			if ($action != 'editincoterm' && $user->rights->societe->creer) {
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td colspan="3">';
-			if ($action != 'editincoterm')
-			{
+			if ($action != 'editincoterm') {
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
@@ -2699,8 +2700,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		}
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td>';
@@ -2713,10 +2713,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancySellCode");
 			print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled))
-			{
-				if (! empty($object->accountancy_code_sell))
-				{
+			if (! empty($conf->accounting->enabled)) {
+				if (! empty($object->accountancy_code_sell)) {
 					$accountingaccount = new AccountingAccount($db);
 					$accountingaccount->fetch('', $object->accountancy_code_sell, 1);
 
@@ -2731,10 +2729,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancyBuyCode");
 			print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled))
-			{
-				if (! empty($object->accountancy_code_buy))
-				{
+			if (! empty($conf->accounting->enabled)) {
+				if (! empty($object->accountancy_code_buy)) {
 					$accountingaccount2 = new AccountingAccount($db);
 					$accountingaccount2->fetch('', $object->accountancy_code_buy, 1);
 
@@ -2799,62 +2795,51 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 
 		/*
-         *  Actions
-         */
-		if ($action != 'presend')
-		{
+		 *  Actions
+		 */
+		if ($action != 'presend') {
 			print '<div class="tabsAction">'."\n";
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				$at_least_one_email_contact = false;
 				$TContact = $object->contact_array_objects();
-				foreach ($TContact as &$contact)
-				{
-					if (!empty($contact->email))
-					{
+				foreach ($TContact as &$contact) {
+					if (!empty($contact->email)) {
 						$at_least_one_email_contact = true;
 						break;
 					}
 				}
 
 				if (empty($user->socid)) {
-					if (!empty($object->email) || $at_least_one_email_contact)
-					{
+					if (!empty($object->email) || $at_least_one_email_contact) {
 						$langs->load("mails");
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 					} else {
 						$langs->load("mails");
-				   		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 
-				if ($user->rights->societe->creer)
-				{
+				if ($user->rights->societe->creer) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
 				}
 
-				if (!empty($conf->adherent->enabled))
-				{
+				if (!empty($conf->adherent->enabled)) {
 					$adh = new Adherent($db);
 					$result = $adh->fetch('', '', $object->id);
-					if ($result == 0 && ($object->client == 1 || $object->client == 3) && !empty($conf->global->MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS))
-					{
+					if ($result == 0 && ($object->client == 1 || $object->client == 3) && !empty($conf->global->MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS)) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?&action=create&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("NewMember")).'">'.$langs->trans("NewMember").'</a>';
 					}
 				}
 
-				if ($user->rights->societe->supprimer)
-				{
+				if ($user->rights->societe->supprimer) {
 					print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>';
 				}
 
-				if ($user->rights->societe->supprimer)
-				{
-					if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
-					{
+				if ($user->rights->societe->supprimer) {
+					if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) {	// We can't use preloaded confirm form with jmobile
 						print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
 					} else {
 						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
@@ -2870,17 +2855,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$action = 'presend';
 		}
 
-		if ($action != 'presend')
-		{
+		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
-			if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-			{
+			if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) {
 				print '<a name="builddoc"></a>'; // ancre
 
 				/*
-	             * Documents generes
-	             */
+				 * Documents generes
+				 */
 				$filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
 				$urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
 				$genallowed = $user->rights->societe->lire;
@@ -2890,8 +2873,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 
 			// Subsidiaries list
-			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
-			{
+			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES)) {
 				$result = show_subsidiaries($conf, $langs, $db, $object);
 			}
 
@@ -2908,17 +2890,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			print '</div></div></div>';
 
-			if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
-			{
+			if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD)) {
 				// Contacts list
-				if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-				{
+				if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 					$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 				}
 
 				// Addresses list
-				if (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))
-				{
+				if (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT)) {
 					$result = show_addresses($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 				}
 			}
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 4b3cb68e3bb..995f256bc01 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -45,8 +45,7 @@ print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"), '', 'title_se
 
 $vatNumber = GETPOST("vatNumber", 'alpha');
 
-if (!$vatNumber)
-{
+if (!$vatNumber) {
 	print '<br>';
 	print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired", $langs->trans("VATIntraShort")).'</font><br>';
 } else {
@@ -76,8 +75,7 @@ if (!$vatNumber)
 
 	// Check for an error
 	$err = $soapclient->getError();
-	if ($err)
-	{
+	if ($err) {
 		dol_syslog("Constructor error ".$WS_DOL_URL, LOG_ERR);
 	}
 
@@ -96,42 +94,38 @@ if (!$vatNumber)
 	print '<b>'.$langs->trans("Response").'</b>:<br>';
 
 	// Service indisponible
-	if (!is_array($result) || preg_match('/SERVICE_UNAVAILABLE/i', $result['faultstring']))
-	{
+	if (!is_array($result) || preg_match('/SERVICE_UNAVAILABLE/i', $result['faultstring'])) {
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	} elseif (preg_match('/TIMEOUT/i', $result['faultstring']))
-	{
+	} elseif (preg_match('/TIMEOUT/i', $result['faultstring'])) {
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	} elseif (preg_match('/SERVER_BUSY/i', $result['faultstring']))
-	{
+	} elseif (preg_match('/SERVER_BUSY/i', $result['faultstring'])) {
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	} elseif ($result['faultstring'])
-	{
+	} elseif ($result['faultstring']) {
 		print '<font class="error">'.$langs->trans("Error").'</font><br>';
 		$messagetoshow = $result['faultstring'];
-	}
-	// Syntaxe ko
-	elseif (preg_match('/INVALID_INPUT/i', $result['faultstring'])
-	|| ($result['requestDate'] && !$result['valid']))
-	{
-		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+	} elseif (preg_match('/INVALID_INPUT/i', $result['faultstring'])
+	|| ($result['requestDate'] && !$result['valid'])) {
+		// Syntaxe ko
+		if ($result['requestDate']) {
+			print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+		}
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		print $langs->trans("ValueIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		//$messagetoshow=$soapclient->response;
 	} else {
 		// Syntaxe ok
-		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+		if ($result['requestDate']) {
+			print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+		}
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="ok">'.$langs->trans("Yes").'</font><br>';
 		print $langs->trans("ValueIsValid").': ';
-		if (preg_match('/MS_UNAVAILABLE/i', $result['faultstring']))
-		{
+		if (preg_match('/MS_UNAVAILABLE/i', $result['faultstring'])) {
 			print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE", $countryCode).'</font><br>';
 		} else {
-			if (!empty($result['valid']) && ($result['valid'] == 1 || $result['valid'] == 'true'))
-			{
+			if (!empty($result['valid']) && ($result['valid'] == 1 || $result['valid'] == 'true')) {
 				print '<font class="ok">'.$langs->trans("Yes").'</font>';
 				print '<br>';
 				print $langs->trans("Name").': '.$result['name'].'<br>';
@@ -144,10 +138,10 @@ if (!$vatNumber)
 	}
 
 	// Show log data into page
-	print "\n";
-	print '<!-- ';
-	var_dump($result);
-	print '-->';
+	// print "\n";
+	// print '<!-- ';
+	// var_dump($result);
+	// print '-->';
 }
 
 print '<br>';
@@ -155,8 +149,7 @@ print $langs->trans("VATIntraManualCheck", $langs->trans("VATIntraCheckURL"), $l
 print '<br>';
 print '<div class="center"><input type="button" class="button" value="'.$langs->trans("CloseWindow").'" onclick="javascript: window.close()"></div>';
 
-if ($messagetoshow)
-{
+if ($messagetoshow) {
 	print '<br><br>';
 	print "\n".'Error returned:<br>';
 	print nl2br($messagetoshow);
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 82984409325..37ad82602fb 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -34,7 +34,7 @@ class Contacts extends DolibarrApi
 	 *
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'lastname',
 	);
 
@@ -71,8 +71,7 @@ class Contacts extends DolibarrApi
 	 */
 	public function get($id, $includecount = 0, $includeroles = 0)
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
-		{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
 			throw new RestException(401, 'No permission to read contacts');
 		}
 		if ($id == 0) {
@@ -81,23 +80,19 @@ class Contacts extends DolibarrApi
 			$result = $this->contact->fetch($id);
 		}
 
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Contact not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if ($includecount)
-		{
+		if ($includecount) {
 			$this->contact->load_ref_elements();
 		}
 
-		if ($includeroles)
-		{
+		if ($includeroles) {
 			$this->contact->fetchRoles();
 		}
 
@@ -119,8 +114,7 @@ class Contacts extends DolibarrApi
 	 */
 	public function getByEmail($email, $includecount = 0, $includeroles = 0)
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
-		{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
 			throw new RestException(401, 'No permission to read contacts');
 		}
 		if (empty($email)) {
@@ -129,23 +123,19 @@ class Contacts extends DolibarrApi
 			$result = $this->contact->fetch('', '', '', $email);
 		}
 
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Contact not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if ($includecount)
-		{
+		if ($includecount) {
 			$this->contact->load_ref_elements();
 		}
 
-		if ($includeroles)
-		{
+		if ($includeroles) {
 			$this->contact->fetchRoles();
 		}
 
@@ -176,8 +166,7 @@ class Contacts extends DolibarrApi
 
 		$obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
-		{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
 			throw new RestException(401, 'No permission to read contacts');
 		}
 
@@ -186,8 +175,9 @@ class Contacts 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)
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
 			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
@@ -201,15 +191,18 @@ class Contacts extends DolibarrApi
 		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON t.fk_soc = s.rowid";
 		$sql .= ' WHERE t.entity IN ('.getEntity('socpeople').')';
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
 			$sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($search_sale > 0)
+		}
+		if ($search_sale > 0) {
 			$sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 
@@ -220,10 +213,8 @@ class Contacts extends DolibarrApi
 		}
 
 		// 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 = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -232,10 +223,8 @@ class Contacts extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 
-		if ($limit)
-		{
-			if ($page < 0)
-			{
+		if ($limit) {
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -243,24 +232,19 @@ class Contacts extends DolibarrApi
 			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$contact_static = new Contact($this->db);
-				if ($contact_static->fetch($obj->rowid))
-				{
+				if ($contact_static->fetch($obj->rowid)) {
 					$contact_static->fetchRoles();
-					if ($includecount)
-					{
+					if ($includecount) {
 						$contact_static->load_ref_elements();
 					}
-					if ($includeroles)
-					{
+					if ($includeroles) {
 						$contact_static->fetchRoles();
 					}
 
@@ -272,8 +256,7 @@ class Contacts extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve contacts : '.$sql);
 		}
-		if (!count($obj_ret))
-		{
+		if (!count($obj_ret)) {
 			throw new RestException(404, 'Contacts not found');
 		}
 		return $obj_ret;
@@ -287,15 +270,13 @@ class Contacts extends DolibarrApi
 	 */
 	public function post($request_data = null)
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
-		{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
 			throw new RestException(401, 'No permission to create/update contacts');
 		}
 		// Check mandatory fields
 		$result = $this->_validate($request_data);
 
-		foreach ($request_data as $field => $value)
-		{
+		foreach ($request_data as $field => $value) {
 			$this->contact->$field = $value;
 		}
 		if ($this->contact->create(DolibarrApiAccess::$user) < 0) {
@@ -313,30 +294,29 @@ class Contacts extends DolibarrApi
 	 */
 	public function put($id, $request_data = null)
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->contact->creer)
-		{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
 			throw new RestException(401, 'No permission to create/update contacts');
 		}
 
 		$result = $this->contact->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Contact not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		foreach ($request_data as $field => $value)
-		{
-			if ($field == 'id') continue;
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') {
+				continue;
+			}
 			$this->contact->$field = $value;
 		}
 
-		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
+		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update')) {
 			return $this->get($id);
+		}
 
 		return false;
 	}
@@ -349,18 +329,15 @@ class Contacts extends DolibarrApi
 	 */
 	public function delete($id)
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->contact->supprimer)
-		{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->supprimer) {
 			throw new RestException(401, 'No permission to delete contacts');
 		}
 		$result = $this->contact->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Contact not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
-		{
+		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		$this->contact->oldcopy = clone $this->contact;
@@ -382,10 +359,12 @@ class Contacts extends DolibarrApi
 		//throw new RestException(401);
 		//}
 
-		if (!isset($request_data["login"]))
+		if (!isset($request_data["login"])) {
 			throw new RestException(400, "login field missing");
-		if (!isset($request_data["password"]))
+		}
+		if (!isset($request_data["password"])) {
 			throw new RestException(400, "password field missing");
+		}
 
 		if (!DolibarrApiAccess::$user->rights->societe->contact->lire) {
 			throw new RestException(401, 'No permission to read contacts');
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 3e8a6c91f92..be61d3a3436 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -33,7 +33,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'name'
 	);
 
@@ -137,46 +137,68 @@ class Thirdparties 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."societe as t";
 		if ($category > 0) {
-			if ($mode != 4) $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
-			if (!in_array($mode, array(1, 2, 3))) $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as cc";
+			if ($mode != 4) {
+				$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
+			}
+			if (!in_array($mode, array(1, 2, 3))) {
+				$sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as cc";
+			}
+		}
+		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 .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 		$sql .= " WHERE t.entity IN (".getEntity('societe').")";
 		$sql .= " AND t.fk_stcomm = st.id";
 
-		if ($mode == 1) $sql .= " AND t.client IN (1, 3)";
-		elseif ($mode == 2) $sql .= " AND t.client IN (2, 3)";
-		elseif ($mode == 3) $sql .= " AND t.client IN (0)";
-		elseif ($mode == 4) $sql .= " AND t.fournisseur IN (1)";
+		if ($mode == 1) {
+			$sql .= " AND t.client IN (1, 3)";
+		} elseif ($mode == 2) {
+			$sql .= " AND t.client IN (2, 3)";
+		} elseif ($mode == 3) {
+			$sql .= " AND t.client IN (0)";
+		} elseif ($mode == 4) {
+			$sql .= " AND t.fournisseur IN (1)";
+		}
 
 		// Select thirdparties of given category
 		if ($category > 0) {
-			if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid"; }
-			elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid"; }
-			else { $sql .= " AND ((c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid))"; }
+			if (!empty($mode) && $mode != 4) {
+				$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid";
+			} elseif (!empty($mode) && $mode == 4) {
+				$sql .= " AND cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid";
+			} else {
+				$sql .= " AND ((c.fk_categorie = ".$this->db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$this->db->escape($category)." AND cc.fk_soc = t.rowid))";
+			}
 		}
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc";
+		}
 		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-		if ($socids) $sql .= " AND t.rowid IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ($socids) {
+			$sql .= " AND t.rowid IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -195,13 +217,11 @@ class Thirdparties extends DolibarrApi
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$soc_static = new Societe($this->db);
 				if ($soc_static->fetch($obj->rowid)) {
@@ -235,8 +255,9 @@ class Thirdparties extends DolibarrApi
 		foreach ($request_data as $field => $value) {
 			$this->company->$field = $value;
 		}
-		if ($this->company->create(DolibarrApiAccess::$user) < 0)
+		if ($this->company->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+		}
 
 		return $this->company->id;
 	}
@@ -264,7 +285,9 @@ class Thirdparties extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->company->$field = $value;
 		}
 
@@ -295,8 +318,7 @@ class Thirdparties extends DolibarrApi
 
 		$error = 0;
 
-		if ($id == $idtodelete)
-		{
+		if ($id == $idtodelete) {
 			throw new RestException(400, 'Try to merge a thirdparty into itself');
 		}
 
@@ -345,26 +367,26 @@ class Thirdparties extends DolibarrApi
 			'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
 			'model_pdf', 'fk_projet'
 		);
-		foreach ($listofproperties as $property)
-		{
-			if (empty($object->$property)) $object->$property = $soc_origin->$property;
+		foreach ($listofproperties as $property) {
+			if (empty($object->$property)) {
+				$object->$property = $soc_origin->$property;
+			}
 		}
 
 		// Concat some data
 		$listofproperties = array(
 			'note_public', 'note_private'
 		);
-		foreach ($listofproperties as $property)
-		{
+		foreach ($listofproperties as $property) {
 			$object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
 		}
 
 		// Merge extrafields
-		if (is_array($soc_origin->array_options))
-		{
-			foreach ($soc_origin->array_options as $key => $val)
-			{
-				if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+		if (is_array($soc_origin->array_options)) {
+			foreach ($soc_origin->array_options as $key => $val) {
+				if (empty($object->array_options[$key])) {
+					$object->array_options[$key] = $val;
+				}
 			}
 		}
 
@@ -378,8 +400,7 @@ class Thirdparties extends DolibarrApi
 		// If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
 		if ($soc_origin->code_client == $object->code_client
 			|| $soc_origin->code_fournisseur == $object->code_fournisseur
-			|| $soc_origin->barcode == $object->barcode)
-		{
+			|| $soc_origin->barcode == $object->barcode) {
 			dol_syslog("We clean customer and supplier code so we will be able to make the update of target");
 			$soc_origin->code_client = '';
 			$soc_origin->code_fournisseur = '';
@@ -389,8 +410,7 @@ class Thirdparties extends DolibarrApi
 
 		// Update
 		$result = $object->update($object->id, $user, 0, 1, 1, 'merge');
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$error++;
 		}
 
@@ -425,8 +445,7 @@ class Thirdparties extends DolibarrApi
 			);
 
 			//First, all core objects must update their tables
-			foreach ($objects as $object_name => $object_file)
-			{
+			foreach ($objects as $object_name => $object_file) {
 				require_once DOL_DOCUMENT_ROOT.$object_file;
 
 				if (!$error && !$object_name::replaceThirdparty($this->db, $soc_origin->id, $object->id)) {
@@ -584,8 +603,7 @@ class Thirdparties extends DolibarrApi
 		}
 
 		$result = $this->company->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -593,13 +611,11 @@ class Thirdparties extends DolibarrApi
 
 		$result = $categories->getListForItem($id, 'customer', $sortfield, $sortorder, $limit, $page);
 
-		if (is_numeric($result) && $result < 0)
-		{
+		if (is_numeric($result) && $result < 0) {
 			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
 		}
 
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
-		{
+		if (is_numeric($result) && $result == 0) {	// To fix a return of 0 instead of empty array of method getListForItem
 			return array();
 		}
 
@@ -702,8 +718,7 @@ class Thirdparties extends DolibarrApi
 		}
 
 		$result = $this->company->fetch($id);
-		if (!$result)
-		{
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -711,13 +726,11 @@ class Thirdparties extends DolibarrApi
 
 		$result = $categories->getListForItem($id, 'supplier', $sortfield, $sortorder, $limit, $page);
 
-		if (is_numeric($result) && $result < 0)
-		{
+		if (is_numeric($result) && $result < 0) {
 			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
 		}
 
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
-		{
+		if (is_numeric($result) && $result == 0) {	// To fix a return of 0 instead of empty array of method getListForItem
 			return array();
 		}
 
@@ -1005,8 +1018,12 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT f.ref, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE f.rowid = re.fk_facture_source AND re.fk_soc = ".$id;
-		if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
-		if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
+		if ($filter == "available") {
+			$sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
+		}
+		if ($filter == "used") {
+			$sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
+		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 
@@ -1137,7 +1154,9 @@ class Thirdparties extends DolibarrApi
 		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
 		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
+		if ($id) {
+			$sql .= " WHERE fk_soc  = ".$id." ";
+		}
 
 
 		$result = $this->db->query($sql);
@@ -1150,11 +1169,9 @@ class Thirdparties extends DolibarrApi
 
 		$accounts = array();
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$account = new CompanyBankAccount($this->db);
 				if ($account->fetch($obj->rowid)) {
@@ -1209,8 +1226,9 @@ class Thirdparties extends DolibarrApi
 			$account->$field = $value;
 		}
 
-		if ($account->create(DolibarrApiAccess::$user) < 0)
+		if ($account->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, 'Error creating Company Bank account');
+		}
 
 		if (empty($account->rum)) {
 			require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
@@ -1219,8 +1237,9 @@ class Thirdparties extends DolibarrApi
 			$account->date_rum = dol_now();
 		}
 
-		if ($account->update(DolibarrApiAccess::$user) < 0)
+		if ($account->update(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, 'Error updating values');
+		}
 
 		return $this->_cleanObjectDatas($account);
 	}
@@ -1264,8 +1283,9 @@ class Thirdparties extends DolibarrApi
 			$account->date_rum = dol_now();
 		}
 
-		if ($account->update(DolibarrApiAccess::$user) < 0)
+		if ($account->update(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, 'Error updating values');
+		}
 
 		return $this->_cleanObjectDatas($account);
 	}
@@ -1290,8 +1310,9 @@ class Thirdparties extends DolibarrApi
 
 		$account->fetch($bankaccount_id);
 
-		if (!$account->socid == $id)
+		if (!$account->socid == $id) {
 			throw new RestException(401);
+		}
 
 		return $account->delete(DolibarrApiAccess::$user);
 	}
@@ -1342,8 +1363,12 @@ class Thirdparties extends DolibarrApi
 
 		$sql = "SELECT rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
-		if ($companybankid) $sql .= " AND rowid = ".$companybankid."";
+		if ($id) {
+			$sql .= " WHERE fk_soc  = ".$id." ";
+		}
+		if ($companybankid) {
+			$sql .= " AND rowid = ".$companybankid."";
+		}
 
 		$i = 0;
 		$accounts = array();
@@ -1409,7 +1434,9 @@ class Thirdparties extends DolibarrApi
 		 */
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
 		$sql .= " WHERE fk_soc = $id";
-		if ($site) $sql .= " AND site ='$site'";
+		if ($site) {
+			$sql .= " AND site ='$site'";
+		}
 
 		$result = $this->db->query($sql);
 
@@ -1422,8 +1449,7 @@ class Thirdparties extends DolibarrApi
 		$accounts = array();
 
 		$num = $this->db->num_rows($result);
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $this->db->fetch_object($result);
 			$account = new SocieteAccount($this->db);
 
@@ -1493,8 +1519,9 @@ class Thirdparties extends DolibarrApi
 				$account->$field = $value;
 			}
 
-			if ($account->create(DolibarrApiAccess::$user) < 0)
+			if ($account->create(DolibarrApiAccess::$user) < 0) {
 				throw new RestException(500, 'Error creating SocieteAccount entity. Ensure that the ID of thirdparty provided does exist!');
+			}
 
 			$this->_cleanObjectDatas($account);
 
@@ -1582,8 +1609,9 @@ class Thirdparties extends DolibarrApi
 				$account->$field = $value;
 			}
 
-			if ($account->update(DolibarrApiAccess::$user) < 0)
+			if ($account->update(DolibarrApiAccess::$user) < 0) {
 				throw new RestException(500, 'Error updating SocieteAccount entity.');
+			}
 		}
 
 		$this->_cleanObjectDatas($account);
@@ -1624,8 +1652,9 @@ class Thirdparties extends DolibarrApi
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$this->db->escape($request_data['site'])."' ";
 				$result = $this->db->query($sql);
 
-				if ($result && $this->db->num_rows($result) !== 0)
+				if ($result && $this->db->num_rows($result) !== 0) {
 					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
+				}
 			}
 
 			$obj = $this->db->fetch_object($result);
@@ -1636,8 +1665,9 @@ class Thirdparties extends DolibarrApi
 				$account->$field = $value;
 			}
 
-			if ($account->update(DolibarrApiAccess::$user) < 0)
+			if ($account->update(DolibarrApiAccess::$user) < 0) {
 				throw new RestException(500, 'Error updating SocieteAccount account');
+			}
 
 			$this->_cleanObjectDatas($account);
 
@@ -1713,8 +1743,7 @@ class Thirdparties extends DolibarrApi
 			$i = 0;
 
 			$num = $this->db->num_rows($result);
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$account = new SocieteAccount($this->db);
 				$account->fetch($obj->rowid);
@@ -1781,8 +1810,9 @@ class Thirdparties extends DolibarrApi
 	{
 		$thirdparty = array();
 		foreach (Thirdparties::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$thirdparty[$field] = $data[$field];
 		}
 		return $thirdparty;
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index f88027b1491..6b09d88ac71 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -64,8 +64,7 @@ class Client extends Societe
 
 		$sql = "SELECT count(s.rowid) as nb, s.client";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
@@ -75,12 +74,14 @@ class Client extends Societe
 		$sql .= " GROUP BY s.client";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if ($obj->client == 1 || $obj->client == 3) $this->nb["customers"] += $obj->nb;
-				if ($obj->client == 2 || $obj->client == 3) $this->nb["prospects"] += $obj->nb;
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if ($obj->client == 1 || $obj->client == 3) {
+					$this->nb["customers"] += $obj->nb;
+				}
+				if ($obj->client == 2 || $obj->client == 3) {
+					$this->nb["prospects"] += $obj->nb;
+				}
 			}
 			$this->db->free($resql);
 			return 1;
@@ -101,8 +102,10 @@ class Client extends Societe
 	{
 		global $langs;
 
-   		$sql = "SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcomm";
-   		if ($active >= 0) $sql .= " WHERE active = ".$active;
+		$sql = "SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcomm";
+		if ($active >= 0) {
+			$sql .= " WHERE active = ".$active;
+		}
 		$resql = $this->db->query($sql);
 		$num = $this->db->num_rows($resql);
 		$i = 0;
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index a123fa749c9..ab8271d7b70 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -84,32 +84,33 @@ class CompanyBankAccount extends Account
 		$error = 0;
 		// Correct default_rib to be sure to have always one default
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib where fk_soc = ".$this->socid." AND default_rib = 1 AND type = 'ban'";
-   		$result = $this->db->query($sql);
-		if ($result)
-		{
+		$result = $this->db->query($sql);
+		if ($result) {
 			$numrows = $this->db->num_rows($result);
-			if ($this->default_rib && $numrows > 0) $this->default_rib = 0;
-			if (empty($this->default_rib) && $numrows == 0) $this->default_rib = 1;
+			if ($this->default_rib && $numrows > 0) {
+				$this->default_rib = 0;
+			}
+			if (empty($this->default_rib) && $numrows == 0) {
+				$this->default_rib = 1;
+			}
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_rib (fk_soc, type, datec)";
 		$sql .= " VALUES (".$this->socid.", 'ban', '".$this->db->idate($now)."')";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->affected_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->affected_rows($resql)) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_rib");
 
-				if (!$notrigger)
-				{
-				   	// Call trigger
+				if (!$notrigger) {
+					// Call trigger
 					$result = $this->call_trigger('COMPANY_RIB_CREATE', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 
-					if (!$error)
-					{
+					if (!$error) {
 						return 1;
 					} else {
 						return 0;
@@ -136,10 +137,16 @@ class CompanyBankAccount extends Account
 		global $conf;
 		$error = 0;
 
-		if (!$this->id) return -1;
+		if (!$this->id) {
+			return -1;
+		}
 
-		if (dol_strlen($this->domiciliation) > 255) $this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
-		if (dol_strlen($this->owner_address) > 255) $this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
+		if (dol_strlen($this->domiciliation) > 255) {
+			$this->domiciliation = dol_trunc($this->domiciliation, 254, 'right', 'UTF-8', 1);
+		}
+		if (dol_strlen($this->owner_address) > 255) {
+			$this->owner_address = dol_trunc($this->owner_address, 254, 'right', 'UTF-8', 1);
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET";
 		$sql .= " bank = '".$this->db->escape($this->bank)."'";
@@ -153,28 +160,28 @@ class CompanyBankAccount extends Account
 		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
 		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 		$sql .= ",default_rib = ".$this->default_rib;
-		if ($conf->prelevement->enabled)
-		{
+		if ($conf->prelevement->enabled) {
 			$sql .= ",frstrecur = '".$this->db->escape($this->frstrecur)."'";
 			$sql .= ",rum = '".$this->db->escape($this->rum)."'";
 			$sql .= ",date_rum = ".($this->date_rum ? "'".$this->db->idate($this->date_rum)."'" : "null");
 		}
-		if (trim($this->label) != '')
+		if (trim($this->label) != '') {
 			$sql .= ",label = '".$this->db->escape($this->label)."'";
-		else $sql .= ",label = NULL";
+		} else {
+			$sql .= ",label = NULL";
+		}
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if (!$notrigger)
-			{
+		if ($result) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('COMPANY_RIB_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
-				if (!$error)
-				{
+				if (!$error) {
 					return 1;
 				} else {
 					return -1;
@@ -199,24 +206,29 @@ class CompanyBankAccount extends Account
 	 */
 	public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
 	{
-		if (empty($id) && empty($socid)) return -1;
+		if (empty($id) && empty($socid)) {
+			return -1;
+		}
 
 		$sql = "SELECT rowid, type, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
 		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur, date_rum";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id)    $sql .= " WHERE rowid = ".$id;
-		if ($socid)
-		{
+		if ($id) {
+			$sql .= " WHERE rowid = ".$id;
+		}
+		if ($socid) {
 			$sql .= " WHERE fk_soc  = ".$socid;
-			if ($default > -1) $sql .= " AND default_rib = ".$this->db->escape($default);
-			if ($type) $sql .= " AND type ='".$this->db->escape($type)."'";
+			if ($default > -1) {
+				$sql .= " AND default_rib = ".$this->db->escape($default);
+			}
+			if ($type) {
+				$sql .= " AND type ='".$this->db->escape($type)."'";
+			}
 		}
 
 		$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->ref = $obj->fk_soc.'-'.$obj->label; // Generate an artificial ref
@@ -268,28 +280,26 @@ class CompanyBankAccount extends Account
 
 		$this->db->begin();
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('COMPANY_RIB_DELETE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib";
 			$sql .= " WHERE rowid  = ".$this->id;
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -332,10 +342,8 @@ class CompanyBankAccount extends Account
 
 		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 		$result1 = $this->db->query($sql1);
-		if ($result1)
-		{
-			if ($this->db->num_rows($result1) == 0)
-			{
+		if ($result1) {
+			if ($this->db->num_rows($result1) == 0) {
 				return 0;
 			} else {
 				$obj = $this->db->fetch_object($result1);
@@ -352,8 +360,7 @@ class CompanyBankAccount extends Account
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
-				if (!$result2 || !$result3)
-				{
+				if (!$result2 || !$result3) {
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index e88ea0e4f7c..39b14862f12 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -232,8 +232,12 @@ class CompanyPaymentMode extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 	}
 
 	/**
@@ -313,8 +317,12 @@ class CompanyPaymentMode extends CommonObject
 	 */
 	public function fetch($id, $ref = null, $socid = 0, $type = '', $morewhere = '')
 	{
-		if ($socid) $morewhere .= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
-		if ($type)  $morewhere .= " AND type = '".$this->db->escape($type)."'";
+		if ($socid) {
+			$morewhere .= " AND fk_soc  = ".$this->db->escape($socid)." AND default_rib = 1";
+		}
+		if ($type) {
+			$morewhere .= " AND type = '".$this->db->escape($type)."'";
+		}
 
 		$result = $this->fetchCommon($id, $ref, $morewhere);
 		//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
@@ -375,7 +383,9 @@ class CompanyPaymentMode extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$companylink = '';
@@ -386,33 +396,40 @@ class CompanyPaymentMode extends CommonObject
 
 		$url = dol_buildpath('/monmodule/companypaymentmode_card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowCompanyPaymentMode");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -433,33 +450,36 @@ class CompanyPaymentMode extends CommonObject
 
 		dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 		$result1 = $this->db->query($sql1);
-		if ($result1)
-		{
-			if ($this->db->num_rows($result1) == 0)
-			{
+		if ($result1) {
+			if ($this->db->num_rows($result1) == 0) {
 				return 0;
 			} else {
 				$obj = $this->db->fetch_object($result1);
 
 				$type = '';
-				if (empty($alltypes)) $type = $obj->type;
+				if (empty($alltypes)) {
+					$type = $obj->type;
+				}
 
 				$this->db->begin();
 
 				$sql2 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 0, tms = tms";
 				$sql2 .= " WHERE default_rib <> 0 AND fk_soc = ".$obj->fk_soc;
-				if ($type) $sql2 .= " AND type = '".$this->db->escape($type)."'";
+				if ($type) {
+					$sql2 .= " AND type = '".$this->db->escape($type)."'";
+				}
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result2 = $this->db->query($sql2);
 
 				$sql3 = "UPDATE ".MAIN_DB_PREFIX."societe_rib SET default_rib = 1";
 				$sql3 .= " WHERE rowid = ".$obj->id;
-				if ($type) $sql3 .= " AND type = '".$this->db->escape($type)."'";
+				if ($type) {
+					$sql3 .= " AND type = '".$this->db->escape($type)."'";
+				}
 				dol_syslog(get_class($this).'::setAsDefault', LOG_DEBUG);
 				$result3 = $this->db->query($sql3);
 
-				if (!$result2 || !$result3)
-				{
+				if (!$result2 || !$result3) {
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
@@ -496,8 +516,7 @@ class CompanyPaymentMode extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
@@ -507,7 +526,9 @@ class CompanyPaymentMode extends CommonObject
 		}
 
 		$statusType = 'status5';
-		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+		if ($status == self::STATUS_ENABLED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -525,28 +546,23 @@ class CompanyPaymentMode extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 115750dd0ab..6121625ba41 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -905,9 +905,8 @@ class Societe extends CommonObject
 				// Ajout du commercial affecte
 				if ($this->commercial_id != '' && $this->commercial_id != -1) {
 					$this->add_commercial($user, $this->commercial_id);
-				}
-				// si un commercial cree un client il lui est affecte automatiquement
-				elseif (empty($user->rights->societe->client->voir)) {
+				} elseif (empty($user->rights->societe->client->voir)) {
+					// si un commercial cree un client il lui est affecte automatiquement
 					$this->add_commercial($user, $user->id);
 				}
 
@@ -2626,20 +2625,17 @@ class Societe extends CommonObject
 
 		$s = '';
 		if (empty($option) || preg_match('/prospect/', $option)) {
-			if (($this->client == 2 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-			{
+			if (($this->client == 2 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 				$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
 			}
 		}
 		if (empty($option) || preg_match('/customer/', $option)) {
-			if (($this->client == 1 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-			{
+			if (($this->client == 1 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
 				$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
 			}
 		}
 		if (empty($option) || preg_match('/supplier/', $option)) {
-			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $this->fournisseur)
-			{
+			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $this->fournisseur) {
 				$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
 			}
 		}
@@ -3811,8 +3807,7 @@ class Societe extends CommonObject
 
 				dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
 				$result = $this->create_individual($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					setEventMessages($this->error, $this->errors, 'errors');
 					$this->db->rollback();
 					return -1;
@@ -4682,8 +4677,7 @@ class Societe extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index a315044683b..64a914ff549 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -172,7 +172,9 @@ class SocieteAccount extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+			$this->fields['rowid']['visible'] = 0;
+		}
 	}
 
 	/**
@@ -248,7 +250,9 @@ class SocieteAccount extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -375,7 +379,9 @@ class SocieteAccount extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -388,33 +394,40 @@ class SocieteAccount extends CommonObject
 
 		$url = dol_buildpath('/website/websiteaccount_card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("WebsiteAccount");
 				$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;
@@ -444,35 +457,49 @@ class SocieteAccount extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			$prefix = '';
-			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');
-		} elseif ($mode == 6)
-		{
-			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 ($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');
+			}
+		} elseif ($mode == 6) {
+			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');
+			}
 		}
 	}
 
@@ -489,28 +516,23 @@ class SocieteAccount extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index fe8c2adb7bc..3a0e97228ef 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -35,22 +35,32 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thi
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 $object = new Societe($db);
-if ($socid > 0) $object->fetch($socid);
+if ($socid > 0) {
+	$object->fetch($socid);
+}
 
 // Sort & Order fields
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = 'DESC';
-if (!$sortfield) $sortfield = 'dateprint';
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
+if (!$sortfield) {
+	$sortfield = 'dateprint';
+}
 
 // Search fields
 $sref = GETPOST("sref");
@@ -59,8 +69,7 @@ $month = GETPOST('month', 'int');
 $year = GETPOST('year', 'int');
 
 // Clean up on purge search criteria ?
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 	$sref = '';
 	$sprod_fulldescr = '';
 	$year = '';
@@ -83,7 +92,9 @@ $hookmanager->initHooks(array('consumptionthirdparty'));
 
 $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 
@@ -96,12 +107,13 @@ $formother = new FormOther($db);
 $productstatic = new Product($db);
 
 $title = $langs->trans("Referers", $object->name);
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name." - ".$title;
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if (empty($socid))
-{
+if (empty($socid)) {
 	dol_print_error($db);
 	exit;
 }
@@ -118,15 +130,13 @@ print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 print '<table class="border centpercent tableforfield">';
 
-if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-{
+if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
 //if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
 
-if ($object->client)
-{
+if ($object->client) {
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CustomerCode').'</td><td colspan="3">';
 	print $object->code_client;
@@ -137,21 +147,32 @@ if ($object->client)
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 
 	$obj = $db->fetch_object($resql);
 	$nbFactsClient = $obj->nb;
 	$thirdTypeArray['customer'] = $langs->trans("customer");
-	if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
-	if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
-	if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
-	if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
+	if ($conf->propal->enabled && $user->rights->propal->lire) {
+		$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
+	}
+	if ($conf->commande->enabled && $user->rights->commande->lire) {
+		$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
+	}
+	if ($conf->facture->enabled && $user->rights->facture->lire) {
+		$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
+	}
+	if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+		$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
+	}
 }
 
-if (!empty($conf->ficheinter->enabled) && !empty($user->rights->ficheinter->lire)) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
+if (!empty($conf->ficheinter->enabled) && !empty($user->rights->ficheinter->lire)) {
+	$elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
+}
 
-if ($object->fournisseur)
-{
+if ($object->fournisseur) {
 	$langs->load("supplier_proposal");
 	print '<tr><td class="titlefield">';
 	print $langs->trans('SupplierCode').'</td><td colspan="3">';
@@ -163,14 +184,22 @@ if ($object->fournisseur)
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."commande_fournisseur where fk_soc = ".$socid;
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 
 	$obj = $db->fetch_object($resql);
 	$nbCmdsFourn = $obj->nb;
 	$thirdTypeArray['supplier'] = $langs->trans("supplier");
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
-	if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal'] = $langs->transnoentitiesnoconv('SupplierProposals');
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) {
+		$elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
+	}
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) {
+		$elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
+	}
+	if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) {
+		$elementTypeArray['supplier_proposal'] = $langs->transnoentitiesnoconv('SupplierProposals');
+	}
 }
 print '</table>';
 
@@ -194,8 +223,7 @@ $sql_select = '';
 	$dateprint = 'f.datep';
 	$doc_number='f.id';
 }*/
-if ($type_element == 'fichinter')
-{ 	// Customer : show products from invoices
+if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 	$documentstatic = new Fichinter($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, ';
@@ -205,8 +233,7 @@ if ($type_element == 'fichinter')
 	$dateprint = 'f.datec';
 	$doc_number = 'f.ref';
 }
-if ($type_element == 'invoice')
-{ 	// Customer : show products from invoices
+if ($type_element == 'invoice') { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$documentstatic = new Facture($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
@@ -218,8 +245,7 @@ if ($type_element == 'invoice')
 	$doc_number = 'f.ref';
 	$thirdTypeSelect = 'customer';
 }
-if ($type_element == 'propal')
-{
+if ($type_element == 'propal') {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$documentstatic = new Propal($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, ';
@@ -231,8 +257,7 @@ if ($type_element == 'propal')
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
 }
-if ($type_element == 'order')
-{
+if ($type_element == 'order') {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 	$documentstatic = new Commande($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, ';
@@ -244,8 +269,7 @@ if ($type_element == 'order')
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
 }
-if ($type_element == 'supplier_invoice')
-{ 	// Supplier : Show products from invoices.
+if ($type_element == 'supplier_invoice') { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$documentstatic = new FactureFournisseur($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
@@ -257,8 +281,7 @@ if ($type_element == 'supplier_invoice')
 	$doc_number = 'f.ref';
 	$thirdTypeSelect = 'supplier';
 }
-if ($type_element == 'supplier_proposal')
-{
+if ($type_element == 'supplier_proposal') {
 	require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 	$documentstatic = new SupplierProposal($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
@@ -270,8 +293,7 @@ if ($type_element == 'supplier_proposal')
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'supplier';
 }
-if ($type_element == 'supplier_order')
-{ 	// Supplier : Show products from orders.
+if ($type_element == 'supplier_order') { 	// Supplier : Show products from orders.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 	$documentstatic = new CommandeFournisseur($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
@@ -283,8 +305,7 @@ if ($type_element == 'supplier_order')
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'supplier';
 }
-if ($type_element == 'contract')
-{ 	// Order
+if ($type_element == 'contract') { 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$documentstatic = new Contrat($db);
 	$documentstaticline = new ContratLigne($db);
@@ -301,26 +322,42 @@ if ($type_element == 'contract')
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 
-if (!empty($sql_select))
-{
+if (!empty($sql_select)) {
 	$sql = $sql_select;
 	$sql .= ' d.description as description,';
-	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') $sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'supplier_proposal') $sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'contract') $sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element != 'fichinter') $sql .= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
+	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') {
+		$sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element == 'supplier_proposal') {
+		$sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element == 'contract') {
+		$sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element != 'fichinter') {
+		$sql .= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
+	}
 	$sql .= " s.rowid as socid ";
-	if ($type_element != 'fichinter') $sql .= ", p.ref as prod_ref, p.label as product_label";
+	if ($type_element != 'fichinter') {
+		$sql .= ", p.ref as prod_ref, p.label as product_label";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;
-	if ($type_element != 'fichinter') $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+	if ($type_element != 'fichinter') {
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+	}
 	$sql .= $where;
 	$sql .= dolSqlDateFilter($dateprint, 0, $month, $year);
-	if ($sref) $sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
-	if ($sprod_fulldescr)
-	{
+	if ($sref) {
+		$sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+	}
+	if ($sprod_fulldescr) {
 		$sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') {
+			$sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		}
+		if (GETPOST('type_element') != 'fichinter') {
+			$sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		}
 		$sql .= ")";
 	}
 	$sql .= $db->order($sortfield, $sortorder);
@@ -334,8 +371,7 @@ if (!empty($sql_select))
 
 $disabled = 0;
 $showempty = 2;
-if (empty($elementTypeArray) && !$object->client && !$object->fournisseur)
-{
+if (empty($elementTypeArray) && !$object->client && !$object->fournisseur) {
 	$showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
 	$disabled = 1;
 }
@@ -354,21 +390,36 @@ $param .= "&type_element=".urlencode($type_element);
 
 $total_qty = 0;
 
-if ($sql_select)
-{
+if ($sql_select) {
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 
 	$num = $db->num_rows($resql);
 
 	$param = "&socid=".urlencode($socid)."&type_element=".urlencode($type_element);
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($sprod_fulldescr) $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
-	if ($sref) $param .= "&sref=".urlencode($sref);
-	if ($month) $param .= "&month=".urlencode($month);
-	if ($year) $param .= "&year=".urlencode($year);
-	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($sprod_fulldescr) {
+		$param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
+	}
+	if ($sref) {
+		$param .= "&sref=".urlencode($sref);
+	}
+	if ($month) {
+		$param .= "&month=".urlencode($month);
+	}
+	if ($year) {
+		$param .= "&year=".urlencode($year);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 
 	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
 
@@ -412,8 +463,7 @@ if ($sql_select)
 
 
 	$i = 0;
-	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
-	{
+	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit)) {
 		$documentstatic->id = $objp->doc_id;
 		$documentstatic->ref = $objp->doc_number;
 		$documentstatic->type = $objp->doc_type;
@@ -423,7 +473,9 @@ if ($sql_select)
 		$documentstatic->status = $objp->status;
 		$documentstatic->paye = $objp->paid;
 
-		if (is_object($documentstaticline)) $documentstaticline->statut = $objp->status;
+		if (is_object($documentstaticline)) {
+			$documentstaticline->statut = $objp->status;
+		}
 
 		print '<tr class="oddeven">';
 		print '<td class="nobordernopadding nowrap" width="100">';
@@ -447,8 +499,7 @@ if ($sql_select)
 		$text = ''; $description = ''; $type = 0;
 
 		// Code to show product duplicated from commonobject->printObjectLine
-		if ($objp->fk_product > 0)
-		{
+		if ($objp->fk_product > 0) {
 			$product_static = new Product($db);
 
 			$product_static->type = $objp->fk_product_type;
@@ -459,20 +510,21 @@ if ($sql_select)
 		}
 
 		// Product
-		if ($objp->fk_product > 0)
-		{
+		if ($objp->fk_product > 0) {
 			// Define output language
-			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-			{
+			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 				$prod = new Product($db);
 				$prod->fetch($objp->fk_product);
 
 				$outputlangs = $langs;
 				$newlang = '';
-				if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-				if (empty($newlang)) $newlang = $object->default_lang;
-				if (!empty($newlang))
-				{
+				if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+					$newlang = GETPOST('lang_id', 'aZ09');
+				}
+				if (empty($newlang)) {
+					$newlang = $object->default_lang;
+				}
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
@@ -491,39 +543,40 @@ if ($sql_select)
 			<?php
 			$txt = '';
 			print img_object($langs->trans("ShowReduc"), 'reduc').' ';
-			if ($objp->description == '(DEPOSIT)') $txt = $langs->trans("Deposit");
-			elseif ($objp->description == '(EXCESS RECEIVED)') $txt = $langs->trans("ExcessReceived");
-			elseif ($objp->description == '(EXCESS PAID)') $txt = $langs->trans("ExcessPaid");
+			if ($objp->description == '(DEPOSIT)') {
+				$txt = $langs->trans("Deposit");
+			} elseif ($objp->description == '(EXCESS RECEIVED)') {
+				$txt = $langs->trans("ExcessReceived");
+			} elseif ($objp->description == '(EXCESS PAID)') {
+				$txt = $langs->trans("ExcessPaid");
+			}
 			//else $txt=$langs->trans("Discount");
 			print $txt;
 			?>
 			</a>
 			<?php
-			if ($objp->description)
-			{
-				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
-				{
+			if ($objp->description) {
+				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 				}
-				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
-				{
+				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
-				{
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
-				{
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
-					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
+					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+						echo ' ('.dol_print_date($discount->datec).')';
+					}
 				} else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
@@ -536,15 +589,16 @@ if ($sql_select)
 				echo get_date_range($objp->date_start, $objp->date_end);
 
 				// Add description in form
-				if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-				{
+				if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 					print (!empty($objp->description) && $objp->description != $objp->product_label) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
 				}
 			} else {
-				if (!empty($objp->label) || !empty($objp->description))
-				{
-					if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
-					else $text = img_object($langs->trans('Product'), 'product');
+				if (!empty($objp->label) || !empty($objp->description)) {
+					if ($type == 1) {
+						$text = img_object($langs->trans('Service'), 'service');
+					} else {
+						$text = img_object($langs->trans('Product'), 'product');
+					}
 
 					if (!empty($objp->label)) {
 						$text .= ' <strong>'.$objp->label.'</strong>';
@@ -580,7 +634,9 @@ if ($sql_select)
 		print '</td>';
 
 		//print '<td class="left">'.$prodreftxt.'</td>';
-		if ($type_element == 'invoice' && $objp->doc_type == Facture::TYPE_CREDIT_NOTE) $objp->prod_qty = -($objp->prod_qty);
+		if ($type_element == 'invoice' && $objp->doc_type == Facture::TYPE_CREDIT_NOTE) {
+			$objp->prod_qty = -($objp->prod_qty);
+		}
 		print '<td class="right">'.$objp->prod_qty.'</td>';
 		$total_qty += $objp->prod_qty;
 
@@ -606,9 +662,7 @@ if ($sql_select)
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	$db->free($resql);
-}
-elseif (empty($type_element) || $type_element == -1)
-{
+} elseif (empty($type_element) || $type_element == -1) {
 	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', (!empty($num) ? $num : 0), '', '');
 
 	print '<table class="liste centpercent">'."\n";
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index e57c059a633..570d8531efc 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -42,12 +42,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (!empty($conf->adherent->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+}
 
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
-if (!empty($conf->categorie->enabled)) $langs->load("categories");
-if (!empty($conf->incoterm->enabled)) $langs->load("incoterm");
-if (!empty($conf->notification->enabled)) $langs->load("mails");
+if (!empty($conf->categorie->enabled)) {
+	$langs->load("categories");
+}
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load("incoterm");
+}
+if (!empty($conf->notification->enabled)) {
+	$langs->load("mails");
+}
 
 $mesg = ''; $error = 0; $errors = array();
 
@@ -56,8 +64,12 @@ $cancel     = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm	= GETPOST('confirm');
 $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
-if (empty($socid) && $action == 'view') $action = 'create';
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if (empty($socid) && $action == 'view') {
+	$action = 'create';
+}
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
@@ -68,8 +80,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartycontact', 'globalcard'));
 
-if ($object->fetch($socid) <= 0 && $action == 'view')
-{
+if ($object->fetch($socid) <= 0 && $action == 'view') {
 	$langs->load("errors");
 	print($langs->trans('ErrorRecordNotFound'));
 	exit;
@@ -78,8 +89,7 @@ if ($object->fetch($socid) <= 0 && $action == 'view')
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('thirdparty', 'card', $canvas);
@@ -87,7 +97,9 @@ if (!empty($canvas))
 
 // Security check
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
-if (empty($user->rights->societe->contact->lire)) accessforbidden();
+if (empty($user->rights->societe->contact->lire)) {
+	accessforbidden();
+}
 
 
 /*
@@ -96,15 +108,14 @@ if (empty($user->rights->societe->contact->lire)) accessforbidden();
 
 $parameters = array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
-	if ($cancel)
-	{
+if (empty($reshook)) {
+	if ($cancel) {
 		$action = '';
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -124,21 +135,26 @@ $formfile = new FormFile($db);
 $formadmin = new FormAdmin($db);
 $formcompany = new FormCompany($db);
 
-if ($socid > 0 && empty($object->id))
-{
+if ($socid > 0 && empty($object->id)) {
 	$result = $object->fetch($socid);
-	if ($result <= 0) dol_print_error('', $object->error);
+	if ($result <= 0) {
+		dol_print_error('', $object->error);
+	}
 }
 
 $title = $langs->trans("ThirdParty");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$langs->trans('Card');
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name." - ".$langs->trans('Card');
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
 
-if (!empty($object->id)) $res = $object->fetch_optionals();
+if (!empty($object->id)) {
+	$res = $object->fetch_optionals();
+}
 //if ($res < 0) { dol_print_error($db); exit; }
 
 
@@ -154,11 +170,9 @@ print dol_get_fiche_end();
 
 print '<br>';
 
-if ($action != 'presend')
-{
+if ($action != 'presend') {
 	// Contacts list
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-	{
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 		$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 	}
 }
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 034522a3652..3b35fa344f0 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -40,8 +40,7 @@ $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'))
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	unset($action);
 	$socid = $user->socid;
 }
@@ -52,20 +51,29 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) { $sortfield = $conf->global->MAIN_DOC_SORT_FIELD; }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) { $sortorder = $conf->global->MAIN_DOC_SORT_ORDER; }
+if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
+	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+}
+if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
+	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+}
 
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "position_name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "position_name";
+}
 
 $object = new Societe($db);
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);
 
 	$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
@@ -91,16 +99,19 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $form = new Form($db);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Files");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Files");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name.' - '.$langs->trans("Files");
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	/*
 	 * Show tabs
 	 */
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 	$head = societe_prepare_head($object);
 
 	$form = new Form($db);
@@ -111,8 +122,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'];
 	}
 
@@ -126,13 +136,11 @@ if ($object->id)
 	print '<table class="border tableforfield centpercent">';
 
 	// Prefix
-	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
-	if ($object->client)
-	{
+	if ($object->client) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		print $object->code_client;
@@ -143,8 +151,7 @@ if ($object->id)
 		print '</td></tr>';
 	}
 
-	if ($object->fournisseur)
-	{
+	if ($object->fournisseur) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		print $object->code_fournisseur;
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 9ce38458c7f..0647a11d626 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -38,7 +38,9 @@ $hookmanager->initHooks(array('thirdpartiesindex'));
 $langs->load("companies");
 
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 
 // Security check
 $result = restrictedArea($user, 'societe', 0, '', '', '', '');
@@ -75,37 +77,62 @@ $total = 0;
 
 $sql = "SELECT s.rowid, s.client, s.fournisseur";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid)	$sql .= " AND s.rowid = ".$socid;
-if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
+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->fournisseur->lire) {
+	$sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
+}
 //print $sql;
 $result = $db->query($sql);
-if ($result)
-{
-	while ($objp = $db->fetch_object($result))
-	{
+if ($result) {
+	while ($objp = $db->fetch_object($result)) {
 		$found = 0;
-		if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS) && ($objp->client == 2 || $objp->client == 3)) { $found = 1; $third['prospect']++; }
-		if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) { $found = 1; $third['customer']++; }
-		if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) { $found = 1; $third['supplier']++; }
-		if (!empty($conf->societe->enabled) && $objp->client == 0 && $objp->fournisseur == 0) { $found = 1; $third['other']++; }
-		if ($found) $total++;
+		if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS) && ($objp->client == 2 || $objp->client == 3)) {
+			$found = 1; $third['prospect']++;
+		}
+		if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) {
+			$found = 1; $third['customer']++;
+		}
+		if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) {
+			$found = 1; $third['supplier']++;
+		}
+		if (!empty($conf->societe->enabled) && $objp->client == 0 && $objp->fournisseur == 0) {
+			$found = 1; $third['other']++;
+		}
+		if ($found) {
+			$total++;
+		}
 	}
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder nohover centpercent">'."\n";
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
-if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) + (round($third['customer']) ? 1 : 0) + (round($third['supplier']) ? 1 : 0) + (round($third['other']) ? 1 : 0) >= 2))
-{
+if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) + (round($third['customer']) ? 1 : 0) + (round($third['supplier']) ? 1 : 0) + (round($third['other']) ? 1 : 0) >= 2)) {
 	print '<tr><td class="center" colspan="2">';
 	$dataseries = array();
-	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))     $dataseries[] = array($langs->trans("Prospects"), round($third['prospect']));
-	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))     $dataseries[] = array($langs->trans("Customers"), round($third['customer']));
-	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[] = array($langs->trans("Suppliers"), round($third['supplier']));
-	if (!empty($conf->societe->enabled)) $dataseries[] = array($langs->trans("Others"), round($third['other']));
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
+		$dataseries[] = array($langs->trans("Prospects"), round($third['prospect']));
+	}
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
+		$dataseries[] = array($langs->trans("Customers"), round($third['customer']));
+	}
+	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
+		$dataseries[] = array($langs->trans("Suppliers"), round($third['supplier']));
+	}
+	if (!empty($conf->societe->enabled)) {
+		$dataseries[] = array($langs->trans("Others"), round($third['other']));
+	}
 	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 	$dolgraph = new DolGraph();
 	$dolgraph->SetData($dataseries);
@@ -117,20 +144,17 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	print $dolgraph->show();
 	print '</td></tr>'."\n";
 } else {
-	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
-	{
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
 		$statstring = "<tr>";
 		$statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=p">'.$langs->trans("Prospects").'</a></td><td class="right">'.round($third['prospect']).'</td>';
 		$statstring .= "</tr>";
 	}
-	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))
-	{
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
 		$statstring .= "<tr>";
 		$statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=c">'.$langs->trans("Customers").'</a></td><td class="right">'.round($third['customer']).'</td>';
 		$statstring .= "</tr>";
 	}
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $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)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $user->rights->fournisseur->lire) {
 		$statstring2 = "<tr>";
 		$statstring2 .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=f">'.$langs->trans("Suppliers").'</a></td><td class="right">'.round($third['supplier']).'</td>';
 		$statstring2 .= "</tr>";
@@ -144,8 +168,7 @@ print '</td></tr>';
 print '</table>';
 print '</div>';
 
-if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES))
-{
+if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$elementtype = 'societe';
 
@@ -159,26 +182,24 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 	$sql .= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
 	$sql .= " WHERE c.type = 2";
-	if (!is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) $sql .= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
+	if (!is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
+		$sql .= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
+	}
 	$sql .= " AND c.entity IN (".getEntity('category').")";
 	$sql .= " GROUP BY c.label";
 	$total = 0;
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			$dataseries = array();
 			$rest = 0;
 			$nbmax = 10;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($result);
-				if ($i < $nbmax)
-				{
+				if ($i < $nbmax) {
 					$dataseries[] = array($obj->label, round($obj->nb));
 				} else {
 					$rest += $obj->nb;
@@ -186,8 +207,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 				$total += $obj->nb;
 				$i++;
 			}
-			if ($i > $nbmax)
-			{
+			if ($i > $nbmax) {
 				$dataseries[] = array($langs->trans("Other"), round($rest));
 			}
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -200,8 +220,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 			$dolgraph->draw('idgraphcateg');
 			print $dolgraph->show();
 		} else {
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($result);
 
 				print '<tr class="oddeven"><td>'.$obj->label.'</td><td>'.$obj->nb.'</td></tr>';
@@ -234,24 +253,30 @@ $sql .= ", s.logo";
 $sql .= ", s.entity";
 $sql .= ", s.canvas, s.tms as date_modification, s.status as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid)	$sql .= " AND s.rowid = ".$socid;
-if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur != 1 OR s.client != 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 s.rowid = ".$socid;
+}
+if (!$user->rights->fournisseur->lire) {
+	$sql .= " AND (s.fournisseur != 1 OR s.client != 0)";
+}
 $sql .= $db->order("s.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 //print $sql;
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 
 	$i = 0;
 
-	if ($num > 0)
-	{
+	if ($num > 0) {
 		$transRecordedType = $langs->trans("LastModifiedThirdParties", $max);
 
 		print "\n<!-- last thirdparties modified -->\n";
@@ -263,8 +288,7 @@ if ($result)
 		print '<th class="right"><a href="'.DOL_URL_ROOT.'/societe/list.php?sortfield=s.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
 		print '</tr>'."\n";
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$objp = $db->fetch_object($result);
 
 			$thirdparty_static->id = $objp->rowid;
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index e62b17559ee..76394916550 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -50,14 +50,15 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartylist';
 
-if ($contextpage == 'poslist')
-{
+if ($contextpage == 'poslist') {
 	$_GET['optioncss'] = 'print';
 }
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $socid, '');
 
 $search_all = trim(GETPOST('search_all', 'alphanohtml') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -113,17 +114,47 @@ $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 (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "s.nom";
-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 or if we select empty mass action
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "s.nom";
+}
+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 or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if ($type == 'c') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'customerlist'; if ($search_type == '') $search_type = '1,3'; }
-if ($type == 'p') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'prospectlist'; if ($search_type == '') $search_type = '2,3'; }
-if ($type == 't') { if (empty($contextpage) || $contextpage == 'poslist') $contextpage = 'poslist'; if ($search_type == '') $search_type = '1,2,3'; }
-if ($type == 'f') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'supplierlist'; if ($search_type == '') $search_type = '4'; }
+if ($type == 'c') {
+	if (empty($contextpage) || $contextpage == 'thirdpartylist') {
+		$contextpage = 'customerlist';
+	} if ($search_type == '') {
+		$search_type = '1,3';
+	}
+}
+if ($type == 'p') {
+	if (empty($contextpage) || $contextpage == 'thirdpartylist') {
+		$contextpage = 'prospectlist';
+	} if ($search_type == '') {
+		$search_type = '2,3';
+	}
+}
+if ($type == 't') {
+	if (empty($contextpage) || $contextpage == 'poslist') {
+		$contextpage = 'poslist';
+	} if ($search_type == '') {
+		$search_type = '1,2,3';
+	}
+}
+if ($type == 'f') {
+	if (empty($contextpage) || $contextpage == 'thirdpartylist') {
+		$contextpage = 'supplierlist';
+	} if ($search_type == '') {
+		$search_type = '4';
+	}
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Societe($db);
@@ -154,12 +185,22 @@ $fieldstosearchall = array(
 	's.phone'=>"Phone",
 	's.fax'=>"Fax",
 );
-if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof4'] = 'ProfId4';
-if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof5'] = 'ProfId5';
-if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') $fieldstosearchall['s.idprof6'] = 'ProfId6';
-if (!empty($conf->barcode->enabled)) $fieldstosearchall['s.barcode'] = 'Gencod';
+if (($tmp = $langs->transnoentities("ProfId4".$mysoc->country_code)) && $tmp != "ProfId4".$mysoc->country_code && $tmp != '-') {
+	$fieldstosearchall['s.idprof4'] = 'ProfId4';
+}
+if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp != "ProfId5".$mysoc->country_code && $tmp != '-') {
+	$fieldstosearchall['s.idprof5'] = 'ProfId5';
+}
+if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') {
+	$fieldstosearchall['s.idprof6'] = 'ProfId6';
+}
+if (!empty($conf->barcode->enabled)) {
+	$fieldstosearchall['s.barcode'] = 'Gencod';
+}
 // Personalized search criterias. Example: $conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS = 's.nom=ThirdPartyName;s.name_alias=AliasNameShort;s.code_client=CustomerCode'
-if (!empty($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS)) $fieldstosearchall = dolExplodeIntoArray($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS);
+if (!empty($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS)) {
+	$fieldstosearchall = dolExplodeIntoArray($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS);
+}
 
 
 // Define list of fields to show into list
@@ -216,8 +257,7 @@ $arrayfields = array(
 	's.status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 	's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
 );
-if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-{
+if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
 	$arrayfields['s.price_level'] =array('label'=>"PriceLevel", 'position'=>30, 'checked'=>0);
 }
 
@@ -232,16 +272,14 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if ($action == "change")	// Change customer for TakePOS
-{
+if ($action == "change") {	// Change customer for TakePOS
 	$idcustomer = GETPOST('idcustomer', 'int');
 
 	// Check if draft invoice already exists, if not create it
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' AND entity IN (".getEntity('invoice').")";
 	$result = $db->query($sql);
 	$num_lines = $db->num_rows($result);
-	if ($num_lines == 0)
-	{
+	if ($num_lines == 0) {
 		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$invoice = new Facture($db);
 		$constforthirdpartyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
@@ -257,35 +295,39 @@ if ($action == "change")	// Change customer for TakePOS
 	$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$idcustomer." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
 	$resql = $db->query($sql);
 	?>
-	    <script>
-	    console.log("Reload page invoice.php with place=<?php print $place; ?>");
-	    parent.$("#poslines").load("invoice.php?place=<?php print $place; ?>", function() {
-	        //parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
+		<script>
+		console.log("Reload page invoice.php with place=<?php print $place; ?>");
+		parent.$("#poslines").load("invoice.php?place=<?php print $place; ?>", function() {
+			//parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
 			<?php if (!$resql) { ?>
 				alert('Error failed to update customer on draft invoice.');
 			<?php } ?>
-	        parent.$.colorbox.close(); /* Close the popup */
-	    });
-	    </script>
-    <?php
+			parent.$.colorbox.close(); /* Close the popup */
+		});
+		</script>
+	<?php
 	exit;
 }
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Did we click on purge search criteria ?
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_id = '';
 		$search_nom = '';
 		$search_alias = '';
@@ -319,10 +361,10 @@ if (empty($reshook))
 		$search_staff = '';
 		$search_status = -1;
 		$search_stcomm = '';
-	 	$search_level = '';
-	 	$search_parent_name = '';
-	 	$search_import_key = '';
-	 	$toselect = '';
+		$search_level = '';
+		$search_parent_name = '';
+		$search_import_key = '';
+		$toselect = '';
 		$search_array_options = array();
 	}
 
@@ -335,19 +377,22 @@ if (empty($reshook))
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
-	if ($action == 'setstcomm')
-	{
+	if ($action == 'setstcomm') {
 		$object = new Client($db);
 		$result = $object->fetch(GETPOST('stcommsocid'));
 		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcomm');
 		$result = $object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
 		$action = '';
 	}
 }
 
-if ($search_status == '') $search_status = 1; // always display active thirdparty first
+if ($search_status == '') {
+	$search_status = 1; // always display active thirdparty first
+}
 
 
 
@@ -375,9 +420,15 @@ $prospectstatic->loadCacheOfProspStatus();
 
 
 $title = $langs->trans("ListOfThirdParties");
-if ($type == 'c' && (empty($search_type) || ($search_type == '1,3'))) $title = $langs->trans("ListOfCustomers");
-if ($type == 'p' && (empty($search_type) || ($search_type == '2,3'))) $title = $langs->trans("ListOfProspects");
-if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) $title = $langs->trans("ListOfSuppliers");
+if ($type == 'c' && (empty($search_type) || ($search_type == '1,3'))) {
+	$title = $langs->trans("ListOfCustomers");
+}
+if ($type == 'p' && (empty($search_type) || ($search_type == '2,3'))) {
+	$title = $langs->trans("ListOfProspects");
+}
+if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) {
+	$title = $langs->trans("ListOfSuppliers");
+}
 
 // Select every potentiels, and note each potentiels which fit in search parameters
 $tab_level = array();
@@ -386,16 +437,18 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_prospectlevel";
 $sql .= " WHERE active > 0";
 $sql .= " ORDER BY sortorder";
 $resql = $db->query($sql);
-if ($resql)
-{
-	while ($obj = $db->fetch_object($resql))
-	{
+if ($resql) {
+	while ($obj = $db->fetch_object($resql)) {
 		// Compute level text
 		$level = $langs->trans($obj->code);
-		if ($level == $obj->code) $level = $langs->trans($obj->label);
+		if ($level == $obj->code) {
+			$level = $langs->trans($obj->label);
+		}
 		$tab_level[$obj->code] = $level;
 	}
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.address, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
 $sql .= " s.entity,";
@@ -410,13 +463,21 @@ $sql .= " country.code as country_code, country.label as country_label,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " region.code_region as region_code, region.nom as region_name";
 // We'll need these fields in order to filter by sale (including the case where the user can only see his prospects)
-if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
+if ($search_sale) {
+	$sql .= ", sc.fk_soc, sc.fk_user";
+}
 // We'll need these fields in order to filter by categ
-if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
-if ($search_categ_sup) $sql .= ", cs.fk_categorie, cs.fk_soc";
+if ($search_categ_cus) {
+	$sql .= ", cc.fk_categorie, cc.fk_soc";
+}
+if ($search_categ_sup) {
+	$sql .= ", cs.fk_categorie, cs.fk_soc";
+}
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	}
 }
 // Add fields from hooks
 $parameters = array();
@@ -424,80 +485,186 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s2 ON s.parent = s2.rowid";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (s.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 (s.rowid = ef.fk_object)";
+}
 $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_effectif as staff on (staff.id = s.fk_effectif)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as region on (region.	code_region = state.fk_region)";
 // 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
-if (!empty($search_categ_sup)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.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
+}
+if (!empty($search_categ_sup)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+}
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."c_stcomm as st ON s.fk_stcomm = st.id";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale == -2) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
-//elseif ($search_sale || (empty($user->rights->societe->client->voir) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->societe->client->readallthirdparties_advance)) && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-elseif ($search_sale || (empty($user->rights->societe->client->voir) && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if ($search_sale == -2) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
+	//elseif ($search_sale || (empty($user->rights->societe->client->voir) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->societe->client->readallthirdparties_advance)) && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+} elseif ($search_sale || (empty($user->rights->societe->client->voir) && !$socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE s.entity IN (".getEntity('societe').")";
 //if (empty($user->rights->societe->client->voir) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->societe->client->readallthirdparties_advance)) && !$socid)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if (empty($user->rights->societe->client->voir) && !$socid)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($search_sale && $search_sale != -2)    $sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
-if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
-if ($search_sale == -2)    $sql .= " AND sc.fk_user IS NULL";
-elseif ($search_sale > 0)  $sql .= " AND sc.fk_user = ".$db->escape($search_sale);
-if ($search_categ_cus > 0) $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
-if ($search_categ_sup > 0) $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
-if ($search_categ_cus == -2)   $sql .= " AND cc.fk_categorie IS NULL";
-if ($search_categ_sup == -2)   $sql .= " AND cs.fk_categorie IS NULL";
+if (empty($user->rights->societe->client->voir) && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($search_sale && $search_sale != -2) {
+	$sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+}
+if (!$user->rights->fournisseur->lire) {
+	$sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
+}
+if ($search_sale == -2) {
+	$sql .= " AND sc.fk_user IS NULL";
+} elseif ($search_sale > 0) {
+	$sql .= " AND sc.fk_user = ".$db->escape($search_sale);
+}
+if ($search_categ_cus > 0) {
+	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+}
+if ($search_categ_sup > 0) {
+	$sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
+}
+if ($search_categ_cus == -2) {
+	$sql .= " AND cc.fk_categorie IS NULL";
+}
+if ($search_categ_sup == -2) {
+	$sql .= " AND cs.fk_categorie IS NULL";
+}
 
-if ($search_all)           $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
-if (strlen($search_cti))   $sql .= natural_search('s.phone', $search_cti);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+if (strlen($search_cti)) {
+	$sql .= natural_search('s.phone', $search_cti);
+}
 
-if ($search_id > 0)        $sql .= natural_search("s.rowid", $search_id, 1);
-if ($search_nom)           $sql .= natural_search("s.nom", $search_nom);
-if ($search_alias)         $sql .= natural_search("s.name_alias", $search_alias);
-if ($search_nom_only)      $sql .= natural_search("s.nom", $search_nom_only);
-if ($search_customer_code) $sql .= natural_search("s.code_client", $search_customer_code);
-if ($search_supplier_code) $sql .= natural_search("s.code_fournisseur", $search_supplier_code);
-if ($search_account_customer_code) $sql .= natural_search("s.code_compta", $search_account_customer_code);
-if ($search_account_supplier_code) $sql .= natural_search("s.code_compta_fournisseur", $search_account_supplier_code);
-if ($search_address)	   $sql.= natural_search('s.address', $search_address);
-if ($search_town)          $sql .= natural_search("s.town", $search_town);
-if (strlen($search_zip))   $sql .= natural_search("s.zip", $search_zip);
-if ($search_state)         $sql .= natural_search("state.nom", $search_state);
-if ($search_region)        $sql .= natural_search("region.nom", $search_region);
-if ($search_country && $search_country != '-1')       $sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
-if ($search_email)         $sql .= natural_search("s.email", $search_email);
-if (strlen($search_phone)) $sql .= natural_search("s.phone", $search_phone);
-if (strlen($search_fax))   $sql .= natural_search("s.fax", $search_fax);
-if ($search_url)           $sql .= natural_search("s.url", $search_url);
-if (strlen($search_idprof1)) $sql .= natural_search("s.siren", $search_idprof1);
-if (strlen($search_idprof2)) $sql .= natural_search("s.siret", $search_idprof2);
-if (strlen($search_idprof3)) $sql .= natural_search("s.ape", $search_idprof3);
-if (strlen($search_idprof4)) $sql .= natural_search("s.idprof4", $search_idprof4);
-if (strlen($search_idprof5)) $sql .= natural_search("s.idprof5", $search_idprof5);
-if (strlen($search_idprof6)) $sql .= natural_search("s.idprof6", $search_idprof6);
-if (strlen($search_vat))     $sql .= natural_search("s.tva_intra", $search_vat);
+if ($search_id > 0) {
+	$sql .= natural_search("s.rowid", $search_id, 1);
+}
+if ($search_nom) {
+	$sql .= natural_search("s.nom", $search_nom);
+}
+if ($search_alias) {
+	$sql .= natural_search("s.name_alias", $search_alias);
+}
+if ($search_nom_only) {
+	$sql .= natural_search("s.nom", $search_nom_only);
+}
+if ($search_customer_code) {
+	$sql .= natural_search("s.code_client", $search_customer_code);
+}
+if ($search_supplier_code) {
+	$sql .= natural_search("s.code_fournisseur", $search_supplier_code);
+}
+if ($search_account_customer_code) {
+	$sql .= natural_search("s.code_compta", $search_account_customer_code);
+}
+if ($search_account_supplier_code) {
+	$sql .= natural_search("s.code_compta_fournisseur", $search_account_supplier_code);
+}
+if ($search_address) {
+	$sql.= natural_search('s.address', $search_address);
+}
+if ($search_town) {
+	$sql .= natural_search("s.town", $search_town);
+}
+if (strlen($search_zip)) {
+	$sql .= natural_search("s.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_region) {
+	$sql .= natural_search("region.nom", $search_region);
+}
+if ($search_country && $search_country != '-1') {
+	$sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
+}
+if ($search_email) {
+	$sql .= natural_search("s.email", $search_email);
+}
+if (strlen($search_phone)) {
+	$sql .= natural_search("s.phone", $search_phone);
+}
+if (strlen($search_fax)) {
+	$sql .= natural_search("s.fax", $search_fax);
+}
+if ($search_url) {
+	$sql .= natural_search("s.url", $search_url);
+}
+if (strlen($search_idprof1)) {
+	$sql .= natural_search("s.siren", $search_idprof1);
+}
+if (strlen($search_idprof2)) {
+	$sql .= natural_search("s.siret", $search_idprof2);
+}
+if (strlen($search_idprof3)) {
+	$sql .= natural_search("s.ape", $search_idprof3);
+}
+if (strlen($search_idprof4)) {
+	$sql .= natural_search("s.idprof4", $search_idprof4);
+}
+if (strlen($search_idprof5)) {
+	$sql .= natural_search("s.idprof5", $search_idprof5);
+}
+if (strlen($search_idprof6)) {
+	$sql .= natural_search("s.idprof6", $search_idprof6);
+}
+if (strlen($search_vat)) {
+	$sql .= natural_search("s.tva_intra", $search_vat);
+}
 // Filter on type of thirdparty
-if ($search_type > 0 && in_array($search_type, array('1,3', '1,2,3', '2,3'))) $sql .= " AND s.client IN (".$db->sanitize($db->escape($search_type)).")";
-if ($search_type > 0 && in_array($search_type, array('4')))         $sql .= " AND s.fournisseur = 1";
-if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
-if ($search_status != '' && $search_status >= 0) $sql .= natural_search("s.status", $search_status, 2);
-if (!empty($conf->barcode->enabled) && $search_barcode) $sql .= natural_search("s.barcode", $search_barcode);
-if ($search_prive_level && $search_prive_level != '-1') $sql .= natural_search("s.price_level", $search_prive_level, 2);
-if ($search_type_thirdparty && $search_type_thirdparty > 0) $sql .= natural_search("s.fk_typent", $search_type_thirdparty, 2);
-if (!empty($search_staff) && $search_staff != '-1')            $sql .= natural_search("s.fk_effectif", $search_staff, 2);
-if ($search_level)  $sql .= natural_search("s.fk_prospectlevel", join(',', $search_level), 3);
-if ($search_parent_name)   $sql .= natural_search("s2.nom", $search_parent_name);
-if ($search_stcomm != '' && $search_stcomm != -2) $sql .= natural_search("s.fk_stcomm", $search_stcomm, 2);
-if ($search_import_key)    $sql .= natural_search("s.import_key", $search_import_key);
+if ($search_type > 0 && in_array($search_type, array('1,3', '1,2,3', '2,3'))) {
+	$sql .= " AND s.client IN (".$db->sanitize($db->escape($search_type)).")";
+}
+if ($search_type > 0 && in_array($search_type, array('4'))) {
+	$sql .= " AND s.fournisseur = 1";
+}
+if ($search_type == '0') {
+	$sql .= " AND s.client = 0 AND s.fournisseur = 0";
+}
+if ($search_status != '' && $search_status >= 0) {
+	$sql .= natural_search("s.status", $search_status, 2);
+}
+if (!empty($conf->barcode->enabled) && $search_barcode) {
+	$sql .= natural_search("s.barcode", $search_barcode);
+}
+if ($search_prive_level && $search_prive_level != '-1') {
+	$sql .= natural_search("s.price_level", $search_prive_level, 2);
+}
+if ($search_type_thirdparty && $search_type_thirdparty > 0) {
+	$sql .= natural_search("s.fk_typent", $search_type_thirdparty, 2);
+}
+if (!empty($search_staff) && $search_staff != '-1') {
+	$sql .= natural_search("s.fk_effectif", $search_staff, 2);
+}
+if ($search_level) {
+	$sql .= natural_search("s.fk_prospectlevel", join(',', $search_level), 3);
+}
+if ($search_parent_name) {
+	$sql .= natural_search("s2.nom", $search_parent_name);
+}
+if ($search_stcomm != '' && $search_stcomm != -2) {
+	$sql .= natural_search("s.fk_stcomm", $search_stcomm, 2);
+}
+if ($search_import_key) {
+	$sql .= natural_search("s.import_key", $search_import_key);
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
-	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 }
 $sql .= $hookmanager->resPrint;
 
@@ -505,12 +672,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;
 	}
@@ -519,8 +684,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -551,52 +715,133 @@ $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $langs->trans("ThirdParty"), $help_url);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_all != '')     $param = "&sall=".urlencode($search_all);
-if ($search_categ_cus > 0) $param .= '&search_categ_cus='.urlencode($search_categ_cus);
-if ($search_categ_sup > 0) $param .= '&search_categ_sup='.urlencode($search_categ_sup);
-if ($search_sale > 0)	   $param .= '&search_sale='.urlencode($search_sale);
-if ($search_id > 0)        $param .= "&search_id=".urlencode($search_id);
-if ($search_nom != '')     $param .= "&search_nom=".urlencode($search_nom);
-if ($search_alias != '')   $param .= "&search_alias=".urlencode($search_alias);
-if ($search_address != '') $param .= '&search_address=' . urlencode($search_address);
-if ($search_town != '')    $param .= "&search_town=".urlencode($search_town);
-if ($search_zip != '')     $param .= "&search_zip=".urlencode($search_zip);
-if ($search_phone != '')   $param .= "&search_phone=".urlencode($search_phone);
-if ($search_fax != '')     $param .= "&search_fax=".urlencode($search_fax);
-if ($search_email != '')   $param .= "&search_email=".urlencode($search_email);
-if ($search_url != '')     $param .= "&search_url=".urlencode($search_url);
-if ($search_state != '')   $param .= "&search_state=".urlencode($search_state);
-if ($search_country != '') $param .= "&search_country=".urlencode($search_country);
-if ($search_customer_code != '') $param .= "&search_customer_code=".urlencode($search_customer_code);
-if ($search_supplier_code != '') $param .= "&search_supplier_code=".urlencode($search_supplier_code);
-if ($search_account_customer_code != '') $param .= "&search_account_customer_code=".urlencode($search_account_customer_code);
-if ($search_account_supplier_code != '') $param .= "&search_account_supplier_code=".urlencode($search_account_supplier_code);
-if ($search_barcode != '') $param .= "&search_barcode=".urlencode($search_barcode);
-if ($search_idprof1 != '') $param .= '&search_idprof1='.urlencode($search_idprof1);
-if ($search_idprof2 != '') $param .= '&search_idprof2='.urlencode($search_idprof2);
-if ($search_idprof3 != '') $param .= '&search_idprof3='.urlencode($search_idprof3);
-if ($search_idprof4 != '') $param .= '&search_idprof4='.urlencode($search_idprof4);
-if ($search_idprof5 != '') $param .= '&search_idprof5='.urlencode($search_idprof5);
-if ($search_idprof6 != '') $param .= '&search_idprof6='.urlencode($search_idprof6);
-if ($search_vat != '')     $param .= '&search_vat='.urlencode($search_vat);
-if ($search_prive_level != '')    $param .= '&search_prive_level='.urlencode($search_prive_level);
-if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)    $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
-if ($search_type != '')    $param .= '&search_type='.urlencode($search_type);
-if (is_array($search_level) && count($search_level)) foreach ($search_level as $slevel) $param .= '&search_level[]='.urlencode($slevel);
-if ($search_status != '')  $param .= '&search_status='.urlencode($search_status);
-if ($search_stcomm != '')  $param .= '&search_stcomm='.urlencode($search_stcomm);
-if ($search_parent_name != '') $param .= '&search_parent_name='.urlencode($search_parent_name);
-if ($search_import_key != '') $param .= '&search_import_key='.urlencode($search_import_key);
-if ($type != '') $param .= '&type='.urlencode($type);
-if ($optioncss != '')      $param .= '&optioncss='.urlencode($optioncss);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($search_all != '') {
+	$param = "&sall=".urlencode($search_all);
+}
+if ($search_categ_cus > 0) {
+	$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+}
+if ($search_categ_sup > 0) {
+	$param .= '&search_categ_sup='.urlencode($search_categ_sup);
+}
+if ($search_sale > 0) {
+	$param .= '&search_sale='.urlencode($search_sale);
+}
+if ($search_id > 0) {
+	$param .= "&search_id=".urlencode($search_id);
+}
+if ($search_nom != '') {
+	$param .= "&search_nom=".urlencode($search_nom);
+}
+if ($search_alias != '') {
+	$param .= "&search_alias=".urlencode($search_alias);
+}
+if ($search_address != '') {
+	$param .= '&search_address=' . urlencode($search_address);
+}
+if ($search_town != '') {
+	$param .= "&search_town=".urlencode($search_town);
+}
+if ($search_zip != '') {
+	$param .= "&search_zip=".urlencode($search_zip);
+}
+if ($search_phone != '') {
+	$param .= "&search_phone=".urlencode($search_phone);
+}
+if ($search_fax != '') {
+	$param .= "&search_fax=".urlencode($search_fax);
+}
+if ($search_email != '') {
+	$param .= "&search_email=".urlencode($search_email);
+}
+if ($search_url != '') {
+	$param .= "&search_url=".urlencode($search_url);
+}
+if ($search_state != '') {
+	$param .= "&search_state=".urlencode($search_state);
+}
+if ($search_country != '') {
+	$param .= "&search_country=".urlencode($search_country);
+}
+if ($search_customer_code != '') {
+	$param .= "&search_customer_code=".urlencode($search_customer_code);
+}
+if ($search_supplier_code != '') {
+	$param .= "&search_supplier_code=".urlencode($search_supplier_code);
+}
+if ($search_account_customer_code != '') {
+	$param .= "&search_account_customer_code=".urlencode($search_account_customer_code);
+}
+if ($search_account_supplier_code != '') {
+	$param .= "&search_account_supplier_code=".urlencode($search_account_supplier_code);
+}
+if ($search_barcode != '') {
+	$param .= "&search_barcode=".urlencode($search_barcode);
+}
+if ($search_idprof1 != '') {
+	$param .= '&search_idprof1='.urlencode($search_idprof1);
+}
+if ($search_idprof2 != '') {
+	$param .= '&search_idprof2='.urlencode($search_idprof2);
+}
+if ($search_idprof3 != '') {
+	$param .= '&search_idprof3='.urlencode($search_idprof3);
+}
+if ($search_idprof4 != '') {
+	$param .= '&search_idprof4='.urlencode($search_idprof4);
+}
+if ($search_idprof5 != '') {
+	$param .= '&search_idprof5='.urlencode($search_idprof5);
+}
+if ($search_idprof6 != '') {
+	$param .= '&search_idprof6='.urlencode($search_idprof6);
+}
+if ($search_vat != '') {
+	$param .= '&search_vat='.urlencode($search_vat);
+}
+if ($search_prive_level != '') {
+	$param .= '&search_prive_level='.urlencode($search_prive_level);
+}
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
+	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+}
+if ($search_type != '') {
+	$param .= '&search_type='.urlencode($search_type);
+}
+if (is_array($search_level) && count($search_level)) {
+	foreach ($search_level as $slevel) {
+		$param .= '&search_level[]='.urlencode($slevel);
+	}
+}
+if ($search_status != '') {
+	$param .= '&search_status='.urlencode($search_status);
+}
+if ($search_stcomm != '') {
+	$param .= '&search_stcomm='.urlencode($search_stcomm);
+}
+if ($search_parent_name != '') {
+	$param .= '&search_parent_name='.urlencode($search_parent_name);
+}
+if ($search_import_key != '') {
+	$param .= '&search_import_key='.urlencode($search_import_key);
+}
+if ($type != '') {
+	$param .= '&type='.urlencode($type);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // Show delete result message
-if (GETPOST('delsoc'))
-{
+if (GETPOST('delsoc')) {
 	setEventMessages($langs->trans("CompanyDeleted", GETPOST('delsoc')), null, 'mesgs');
 }
 
@@ -606,20 +851,31 @@ $arrayofmassactions = array(
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) $arrayofmassactions = array();
+if ($user->rights->societe->supprimer) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if ($user->rights->societe->creer) {
+	$arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $typefilter = '';
 $label = 'MenuNewThirdParty';
 
-if (!empty($type))
-{
+if (!empty($type)) {
 	$typefilter = '&amp;type='.$type;
-	if ($type == 'p') $label = 'MenuNewProspect';
-	if ($type == 'c') $label = 'MenuNewCustomer';
-	if ($type == 'f') $label = 'NewSupplier';
+	if ($type == 'p') {
+		$label = 'MenuNewProspect';
+	}
+	if ($type == 'c') {
+		$label = 'MenuNewCustomer';
+	}
+	if ($type == 'f') {
+		$label = 'NewSupplier';
+	}
 }
 
 if ($contextpage == 'poslist' && $type == 't' && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
@@ -630,7 +886,9 @@ if ($contextpage == 'poslist' && $type == 't' && (!empty($conf->global->PRODUIT_
 // but allow it too, when a user has the rights to create a new customer
 if ($contextpage != 'poslist') {
 	$url = DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter;
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton = dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url, '', $user->rights->societe->creer);
 } elseif ($user->rights->societe->creer) {
 	$url = DOL_URL_ROOT.'/societe/card.php?action=create&type=t&contextpage=poslist&optioncss=print&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type=t&contextpage=poslist&nomassaction=1&optioncss=print&place='.$place);
@@ -639,7 +897,9 @@ if ($contextpage != 'poslist') {
 }
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formfilter" autocomplete="off">';
-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.'">';
@@ -651,13 +911,13 @@ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sort
 
 $langs->load("other");
 $textprofid = array();
-foreach (array(1, 2, 3, 4, 5, 6) as $key)
-{
+foreach (array(1, 2, 3, 4, 5, 6) as $key) {
 	$label = $langs->transnoentities("ProfId".$key.$mysoc->country_code);
 	$textprofid[$key] = '';
-	if ($label != "ProfId".$key.$mysoc->country_code)
-	{	// Get only text between ()
-		if (preg_match('/\((.*)\)/i', $label, $reg)) $label = $reg[1];
+	if ($label != "ProfId".$key.$mysoc->country_code) {	// Get only text between ()
+		if (preg_match('/\((.*)\)/i', $label, $reg)) {
+			$label = $reg[1];
+		}
 		$textprofid[$key] = $langs->trans("ProfIdShortDesc", $key, $mysoc->country_code, $label);
 	}
 }
@@ -668,29 +928,26 @@ $objecttmp = new Societe($db);
 $trackid = 'thi'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($search_all)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
 // Filter on categories
 $moreforfilter = '';
-if (empty($type) || $type == 'c' || $type == 'p')
-{
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-	{
+if (empty($type) || $type == 'c' || $type == 'p') {
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
-	 	$moreforfilter .= img_picto('', 'category', 'class="pictofixedwidth"');
+		$moreforfilter .= img_picto('', 'category', 'class="pictofixedwidth"');
 		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $langs->trans('CustomersProspectsCategoriesShort'));
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 }
-if (empty($type) || $type == 'f')
-{
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-	{
+if (empty($type) || $type == 'f') {
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= img_picto('', 'category', 'class="pictofixedwidth"');
@@ -700,15 +957,13 @@ if (empty($type) || $type == 'f')
 }
 
 // If the user can view prospects other than his'
-if ($user->rights->societe->client->voir || $socid)
-{
- 	$moreforfilter .= '<div class="divsearchfield">';
- 	$moreforfilter .= img_picto('', 'user', 'class="pictofixedwidth"');
- 	$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $langs->trans('SalesRepresentatives'), 'maxwidth300', 1);
+if ($user->rights->societe->client->voir || $socid) {
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= img_picto('', 'user', 'class="pictofixedwidth"');
+	$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $langs->trans('SalesRepresentatives'), 'maxwidth300', 1);
 	$moreforfilter .= '</div>';
 }
-if ($moreforfilter)
-{
+if ($moreforfilter) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	$parameters = array('type'=>$type);
@@ -720,205 +975,183 @@ if ($moreforfilter)
 $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);
+}
 
-if (empty($arrayfields['customerorsupplier']['checked'])) print '<input type="hidden" name="type" value="'.$type.'">';
+if (empty($arrayfields['customerorsupplier']['checked'])) {
+	print '<input type="hidden" name="type" value="'.$type.'">';
+}
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
 print '<tr class="liste_titre_filter">';
-if (!empty($arrayfields['s.rowid']['checked']))
-{
+if (!empty($arrayfields['s.rowid']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" type="text" name="search_id" size="1" value="'.dol_escape_htmltag($search_id).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.nom']['checked']))
-{
+if (!empty($arrayfields['s.nom']['checked'])) {
 	print '<td class="liste_titre">';
-	if (!empty($search_nom_only) && empty($search_nom)) $search_nom = $search_nom_only;
+	if (!empty($search_nom_only) && empty($search_nom)) {
+		$search_nom = $search_nom_only;
+	}
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_nom" value="'.dol_escape_htmltag($search_nom).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.name_alias']['checked']))
-{
+if (!empty($arrayfields['s.name_alias']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_alias" value="'.dol_escape_htmltag($search_alias).'">';
 	print '</td>';
 }
 // Barcode
-if (!empty($arrayfields['s.barcode']['checked']))
-{
+if (!empty($arrayfields['s.barcode']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_barcode" value="'.dol_escape_htmltag($search_barcode).'">';
 	print '</td>';
 }
 // Customer code
-if (!empty($arrayfields['s.code_client']['checked']))
-{
+if (!empty($arrayfields['s.code_client']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_customer_code" value="'.dol_escape_htmltag($search_customer_code).'">';
 	print '</td>';
 }
 // Supplier code
-if (!empty($arrayfields['s.code_fournisseur']['checked']))
-{
+if (!empty($arrayfields['s.code_fournisseur']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_supplier_code" value="'.dol_escape_htmltag($search_supplier_code).'">';
 	print '</td>';
 }
 // Account Customer code
-if (!empty($arrayfields['s.code_compta']['checked']))
-{
+if (!empty($arrayfields['s.code_compta']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_account_customer_code" value="'.dol_escape_htmltag($search_account_customer_code).'">';
 	print '</td>';
 }
 // Account Supplier code
-if (!empty($arrayfields['s.code_compta_fournisseur']['checked']))
-{
+if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_account_supplier_code" value="'.dol_escape_htmltag($search_account_supplier_code).'">';
 	print '</td>';
 }
 // Address
-if (!empty($arrayfields['s.address']['checked']))
-{
+if (!empty($arrayfields['s.address']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_address" value="'.dol_escape_htmltag($search_address).'">';
 	print '</td>';
 }
 // Zip
-if (!empty($arrayfields['s.zip']['checked']))
-{
+if (!empty($arrayfields['s.zip']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'">';
 	print '</td>';
 }
 // Town
-if (!empty($arrayfields['s.town']['checked']))
-{
+if (!empty($arrayfields['s.town']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'">';
 	print '</td>';
 }
 // State
-if (!empty($arrayfields['state.nom']['checked']))
-{
+if (!empty($arrayfields['state.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 	print '</td>';
 }
 // Region
-if (!empty($arrayfields['region.nom']['checked']))
-{
+if (!empty($arrayfields['region.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_region" value="'.dol_escape_htmltag($search_region).'">';
 	print '</td>';
 }
 // Country
-if (!empty($arrayfields['country.code_iso']['checked']))
-{
+if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print '<td class="liste_titre center">';
 	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 	print '</td>';
 }
 // Company type
-if (!empty($arrayfields['typent.code']['checked']))
-{
+if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
 	// We use showempty=0 here because there is already an unknown value into dictionary.
 	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth100', 1);
 	print '</td>';
 }
 // Multiprice level
-if (!empty($arrayfields['s.price_level']['checked']))
-{
+if (!empty($arrayfields['s.price_level']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_prive_level" value="'.dol_escape_htmltag($search_prive_level).'">';
 	print '</td>';
 }
 // Staff
-if (!empty($arrayfields['staff.code']['checked']))
-{
+if (!empty($arrayfields['staff.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
 	print $form->selectarray("search_staff", $formcompany->effectif_array(0), $search_staff, 0, 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth100', 1);
 	print '</td>';
 }
-if (!empty($arrayfields['s.email']['checked']))
-{
+if (!empty($arrayfields['s.email']['checked'])) {
 	// Email
 	print '<td class="liste_titre">';
 	print '<input class="flat searchemail maxwidth50imp" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.phone']['checked']))
-{
+if (!empty($arrayfields['s.phone']['checked'])) {
 	// Phone
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_phone" value="'.dol_escape_htmltag($search_phone).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.fax']['checked']))
-{
+if (!empty($arrayfields['s.fax']['checked'])) {
 	// Fax
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_fax" value="'.dol_escape_htmltag($search_fax).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.url']['checked']))
-{
+if (!empty($arrayfields['s.url']['checked'])) {
 	// Url
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_url" value="'.dol_escape_htmltag($search_url).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.siren']['checked']))
-{
+if (!empty($arrayfields['s.siren']['checked'])) {
 	// IdProf1
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_idprof1" value="'.dol_escape_htmltag($search_idprof1).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.siret']['checked']))
-{
+if (!empty($arrayfields['s.siret']['checked'])) {
 	// IdProf2
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_idprof2" value="'.dol_escape_htmltag($search_idprof2).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.ape']['checked']))
-{
+if (!empty($arrayfields['s.ape']['checked'])) {
 	// IdProf3
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_idprof3" value="'.dol_escape_htmltag($search_idprof3).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.idprof4']['checked']))
-{
+if (!empty($arrayfields['s.idprof4']['checked'])) {
 	// IdProf4
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_idprof4" value="'.dol_escape_htmltag($search_idprof4).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.idprof5']['checked']))
-{
+if (!empty($arrayfields['s.idprof5']['checked'])) {
 	// IdProf5
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_idprof5" value="'.dol_escape_htmltag($search_idprof5).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.idprof6']['checked']))
-{
+if (!empty($arrayfields['s.idprof6']['checked'])) {
 	// IdProf6
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_idprof6" value="'.dol_escape_htmltag($search_idprof6).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['s.tva_intra']['checked']))
-{
+if (!empty($arrayfields['s.tva_intra']['checked'])) {
 	// Vat number
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth50imp" type="text" name="search_vat" value="'.dol_escape_htmltag($search_vat).'">';
@@ -926,34 +1159,31 @@ if (!empty($arrayfields['s.tva_intra']['checked']))
 }
 
 // Nature (customer/prospect/supplier)
-if (!empty($arrayfields['customerorsupplier']['checked']))
-{
+if (!empty($arrayfields['customerorsupplier']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
+	if ($type != '') {
+		print '<input type="hidden" name="type" value="'.$type.'">';
+	}
 	print $formcompany->selectProspectCustomerType($search_type, 'search_type', 'search_type', 'list');
 	print '</select></td>';
 }
 // Prospect level
-if (!empty($arrayfields['s.fk_prospectlevel']['checked']))
-{
- 	print '<td class="liste_titre center">';
- 	print $form->multiselectarray('search_level', $tab_level, $search_level, 0, 0, 'width75', 0, 0, '', '', '', 2);
+if (!empty($arrayfields['s.fk_prospectlevel']['checked'])) {
+	print '<td class="liste_titre center">';
+	print $form->multiselectarray('search_level', $tab_level, $search_level, 0, 0, 'width75', 0, 0, '', '', '', 2);
 	print '</td>';
 }
 // Prospect status
-if (!empty($arrayfields['s.fk_stcomm']['checked']))
-{
+if (!empty($arrayfields['s.fk_stcomm']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
 	$arraystcomm = array();
-	foreach ($prospectstatic->cacheprospectstatus as $key => $val)
-	{
+	foreach ($prospectstatic->cacheprospectstatus as $key => $val) {
 		$arraystcomm[$val['id']] = ($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
 	}
 	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td>';
 }
-if (!empty($arrayfields['s2.nom']['checked']))
-{
+if (!empty($arrayfields['s2.nom']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_parent_name" value="'.dol_escape_htmltag($search_parent_name).'">';
 	print '</td>';
@@ -966,26 +1196,22 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (!empty($arrayfields['s.datec']['checked']))
-{
+if (!empty($arrayfields['s.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['s.tms']['checked']))
-{
+if (!empty($arrayfields['s.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Status
-if (!empty($arrayfields['s.status']['checked']))
-{
+if (!empty($arrayfields['s.status']['checked'])) {
 	print '<td class="liste_titre center minwidth75imp">';
 	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td>';
 }
-if (!empty($arrayfields['s.import_key']['checked']))
-{
+if (!empty($arrayfields['s.import_key']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input class="flat searchstring maxwidth50" type="text" name="search_import_key" value="'.dol_escape_htmltag($search_import_key).'">';
 	print '</td>';
@@ -998,38 +1224,102 @@ print '</td>';
 
 print "</tr>\n";
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['s.rowid']['checked']))                   print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $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.barcode']['checked']))                 print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode", $param, '', '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.code_client']['checked']))             print_liste_field_titre($arrayfields['s.code_client']['label'], $_SERVER["PHP_SELF"], "s.code_client", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.code_fournisseur']['checked']))        print_liste_field_titre($arrayfields['s.code_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_fournisseur", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.code_compta']['checked']))             print_liste_field_titre($arrayfields['s.code_compta']['label'], $_SERVER["PHP_SELF"], "s.code_compta", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_compta_fournisseur", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.address']['checked']))		 print_liste_field_titre($arrayfields['s.address']['label'], $_SERVER['PHP_SELF'], 's.address', '', $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['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], "s.town", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['region.nom']['checked']))       print_liste_field_titre($arrayfields['region.nom']['label'], $_SERVER["PHP_SELF"], "region.nom", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, "", $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['staff.code']['checked']))       print_liste_field_titre($arrayfields['staff.code']['label'], $_SERVER["PHP_SELF"], "staff.code", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['s.price_level']['checked']))    print_liste_field_titre($arrayfields['s.price_level']['label'], $_SERVER["PHP_SELF"], "s.price_level", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.email']['checked']))          print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.phone']['checked']))          print_liste_field_titre($arrayfields['s.phone']['label'], $_SERVER["PHP_SELF"], "s.phone", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.fax']['checked']))			 print_liste_field_titre($arrayfields['s.fax']['label'], $_SERVER["PHP_SELF"], "s.fax", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.url']['checked']))            print_liste_field_titre($arrayfields['s.url']['label'], $_SERVER["PHP_SELF"], "s.url", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.siren']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 0), $_SERVER["PHP_SELF"], "s.siren", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-if (!empty($arrayfields['s.siret']['checked']))          print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 0), $_SERVER["PHP_SELF"], "s.siret", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-if (!empty($arrayfields['s.ape']['checked']))            print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"), $textprofid[3], 1, 0), $_SERVER["PHP_SELF"], "s.ape", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-if (!empty($arrayfields['s.idprof4']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-if (!empty($arrayfields['s.idprof5']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-if (!empty($arrayfields['s.idprof6']['checked']))        print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-if (!empty($arrayfields['s.tva_intra']['checked']))      print_liste_field_titre($arrayfields['s.tva_intra']['label'], $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-if (!empty($arrayfields['customerorsupplier']['checked']))        print_liste_field_titre(''); // type of customer
-if (!empty($arrayfields['s.fk_prospectlevel']['checked']))        print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "s.fk_prospectlevel", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['s.fk_stcomm']['checked']))               print_liste_field_titre($arrayfields['s.fk_stcomm']['label'], $_SERVER["PHP_SELF"], "s.fk_stcomm", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['s2.nom']['checked']))           print_liste_field_titre($arrayfields['s2.nom']['label'], $_SERVER["PHP_SELF"], "s2.nom", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['s.rowid']['checked'])) {
+	print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $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.barcode']['checked'])) {
+	print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode", $param, '', '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.code_client']['checked'])) {
+	print_liste_field_titre($arrayfields['s.code_client']['label'], $_SERVER["PHP_SELF"], "s.code_client", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.code_fournisseur']['checked'])) {
+	print_liste_field_titre($arrayfields['s.code_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_fournisseur", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.code_compta']['checked'])) {
+	print_liste_field_titre($arrayfields['s.code_compta']['label'], $_SERVER["PHP_SELF"], "s.code_compta", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) {
+	print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_compta_fournisseur", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.address']['checked'])) {
+	print_liste_field_titre($arrayfields['s.address']['label'], $_SERVER['PHP_SELF'], 's.address', '', $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['s.town']['checked'])) {
+	print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], "s.town", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['state.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['region.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['region.nom']['label'], $_SERVER["PHP_SELF"], "region.nom", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['country.code_iso']['checked'])) {
+	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['typent.code']['checked'])) {
+	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, "", $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['staff.code']['checked'])) {
+	print_liste_field_titre($arrayfields['staff.code']['label'], $_SERVER["PHP_SELF"], "staff.code", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['s.price_level']['checked'])) {
+	print_liste_field_titre($arrayfields['s.price_level']['label'], $_SERVER["PHP_SELF"], "s.price_level", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.email']['checked'])) {
+	print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.phone']['checked'])) {
+	print_liste_field_titre($arrayfields['s.phone']['label'], $_SERVER["PHP_SELF"], "s.phone", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.fax']['checked'])) {
+	print_liste_field_titre($arrayfields['s.fax']['label'], $_SERVER["PHP_SELF"], "s.fax", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.url']['checked'])) {
+	print_liste_field_titre($arrayfields['s.url']['label'], $_SERVER["PHP_SELF"], "s.url", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.siren']['checked'])) {
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 0), $_SERVER["PHP_SELF"], "s.siren", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+}
+if (!empty($arrayfields['s.siret']['checked'])) {
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 0), $_SERVER["PHP_SELF"], "s.siret", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+}
+if (!empty($arrayfields['s.ape']['checked'])) {
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"), $textprofid[3], 1, 0), $_SERVER["PHP_SELF"], "s.ape", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+}
+if (!empty($arrayfields['s.idprof4']['checked'])) {
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+}
+if (!empty($arrayfields['s.idprof5']['checked'])) {
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+}
+if (!empty($arrayfields['s.idprof6']['checked'])) {
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+}
+if (!empty($arrayfields['s.tva_intra']['checked'])) {
+	print_liste_field_titre($arrayfields['s.tva_intra']['label'], $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+}
+if (!empty($arrayfields['customerorsupplier']['checked'])) {
+	print_liste_field_titre(''); // type of customer
+}
+if (!empty($arrayfields['s.fk_prospectlevel']['checked'])) {
+	print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "s.fk_prospectlevel", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['s.fk_stcomm']['checked'])) {
+	print_liste_field_titre($arrayfields['s.fk_stcomm']['label'], $_SERVER["PHP_SELF"], "s.fk_stcomm", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['s2.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['s2.nom']['label'], $_SERVER["PHP_SELF"], "s2.nom", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -1037,18 +1327,25 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 $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['s.datec']['checked']))      print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (!empty($arrayfields['s.tms']['checked']))        print_liste_field_titre($arrayfields['s.tms']['label'], $_SERVER["PHP_SELF"], "s.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (!empty($arrayfields['s.status']['checked']))     print_liste_field_titre($arrayfields['s.status']['label'], $_SERVER["PHP_SELF"], "s.status", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['s.import_key']['checked'])) print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['s.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['s.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['s.tms']['label'], $_SERVER["PHP_SELF"], "s.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['s.status']['checked'])) {
+	print_liste_field_titre($arrayfields['s.status']['label'], $_SERVER["PHP_SELF"], "s.status", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['s.import_key']['checked'])) {
+	print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
 
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$companystatic->id = $obj->rowid;
@@ -1068,244 +1365,281 @@ while ($i < min($num, $limit))
 	$companystatic->code_compta_client = $obj->code_compta;
 	$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-   	$companystatic->fk_prospectlevel = $obj->fk_prospectlevel;
-   	$companystatic->fk_parent = $obj->fk_parent;
+	$companystatic->fk_prospectlevel = $obj->fk_prospectlevel;
+	$companystatic->fk_parent = $obj->fk_parent;
 	$companystatic->entity = $obj->entity;
 
 	print '<tr class="oddeven"';
-	if ($contextpage == 'poslist')
-	{
+	if ($contextpage == 'poslist') {
 		print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.urlencode($place).'\'"';
 	}
 	print '>';
-	if (!empty($arrayfields['s.rowid']['checked']))
-	{
+	if (!empty($arrayfields['s.rowid']['checked'])) {
 		print '<td class="tdoverflowmax50">';
 		print $obj->rowid;
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		$savalias = $obj->name_alias;
-		if (!empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias = '';
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
+			$companystatic->name_alias = '';
+		}
 		print '<td'.(empty($conf->global->MAIN_SOCIETE_SHOW_COMPLETE_NAME) ? ' class="tdoverflowmax200"' : '').'>';
-		if ($contextpage == 'poslist')
-		{
+		if ($contextpage == 'poslist') {
 			print $obj->name;
 		} else {
 			print $companystatic->getNomUrl(1, '', 100, 0, 1);
 		}
 		print "</td>\n";
 		$companystatic->name_alias = $savalias;
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.name_alias']['checked']))
-	{
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
 		print '<td class="tdoverflowmax200">';
 		print $companystatic->name_alias;
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Barcode
-	if (!empty($arrayfields['s.barcode']['checked']))
-	{
+	if (!empty($arrayfields['s.barcode']['checked'])) {
 		print '<td>'.$obj->barcode.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Customer code
-	if (!empty($arrayfields['s.code_client']['checked']))
-	{
+	if (!empty($arrayfields['s.code_client']['checked'])) {
 		print '<td class="nowraponall">'.$obj->code_client.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Supplier code
-	if (!empty($arrayfields['s.code_fournisseur']['checked']))
-	{
+	if (!empty($arrayfields['s.code_fournisseur']['checked'])) {
 		print '<td class="nowraponall">'.$obj->code_fournisseur.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Account customer code
-	if (!empty($arrayfields['s.code_compta']['checked']))
-	{
+	if (!empty($arrayfields['s.code_compta']['checked'])) {
 		print '<td>'.$obj->code_compta.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Account supplier code
-	if (!empty($arrayfields['s.code_compta_fournisseur']['checked']))
-	{
+	if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) {
 		print '<td>'.$obj->code_compta_fournisseur.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Address
-	if (!empty($arrayfields['s.address']['checked']))
-	{
+	if (!empty($arrayfields['s.address']['checked'])) {
 		print '<td>'.$obj->address.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Zip
-	if (!empty($arrayfields['s.zip']['checked']))
-	{
+	if (!empty($arrayfields['s.zip']['checked'])) {
 		print "<td>".$obj->zip."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Town
-	if (!empty($arrayfields['s.town']['checked']))
-	{
+	if (!empty($arrayfields['s.town']['checked'])) {
 		print "<td>".$obj->town."</td>\n";
-		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']++;
+		}
 	}
 	// Region
-	if (!empty($arrayfields['region.nom']['checked']))
-	{
+	if (!empty($arrayfields['region.nom']['checked'])) {
 		print "<td>".$obj->region_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 tdoverflowmax100">';
 		$labelcountry = ($obj->country_code && ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code)) ? $langs->trans("Country".$obj->country_code) : $obj->country_label;
 		print $labelcountry;
 		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']++;
+		}
 	}
 	// Multiprice level
-	if (!empty($arrayfields['s.price_level']['checked']))
-	{
+	if (!empty($arrayfields['s.price_level']['checked'])) {
 		print '<td class="center">'.$obj->price_level."</td>\n";
-		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']++;
+		}
 	}
-	if (!empty($arrayfields['s.email']['checked']))
-	{
+	if (!empty($arrayfields['s.email']['checked'])) {
 		print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 0, 0, 1)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.phone']['checked']))
-	{
+	if (!empty($arrayfields['s.phone']['checked'])) {
 		print "<td>".dol_print_phone($obj->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.fax']['checked']))
-	{
+	if (!empty($arrayfields['s.fax']['checked'])) {
 		print "<td>".dol_print_phone($obj->fax, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'fax')."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.url']['checked']))
-	{
+	if (!empty($arrayfields['s.url']['checked'])) {
 		print "<td>".dol_print_url($obj->url, '', '', 1)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.siren']['checked']))
-	{
+	if (!empty($arrayfields['s.siren']['checked'])) {
 		print "<td>".$obj->idprof1."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.siret']['checked']))
-	{
+	if (!empty($arrayfields['s.siret']['checked'])) {
 		print "<td>".$obj->idprof2."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.ape']['checked']))
-	{
+	if (!empty($arrayfields['s.ape']['checked'])) {
 		print "<td>".$obj->idprof3."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.idprof4']['checked']))
-	{
+	if (!empty($arrayfields['s.idprof4']['checked'])) {
 		print "<td>".$obj->idprof4."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.idprof5']['checked']))
-	{
+	if (!empty($arrayfields['s.idprof5']['checked'])) {
 		print "<td>".$obj->idprof5."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.idprof6']['checked']))
-	{
+	if (!empty($arrayfields['s.idprof6']['checked'])) {
 		print "<td>".$obj->idprof6."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// VAT
-	if (!empty($arrayfields['s.tva_intra']['checked']))
-	{
+	if (!empty($arrayfields['s.tva_intra']['checked'])) {
 		print "<td>";
 		print $obj->tva_intra;
-		if ($obj->tva_intra && !isValidVATID($companystatic))
-		{
+		if ($obj->tva_intra && !isValidVATID($companystatic)) {
 			print img_warning("BadVATNumber", '', '');
 		}
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Type
-	if (!empty($arrayfields['customerorsupplier']['checked']))
-	{
+	if (!empty($arrayfields['customerorsupplier']['checked'])) {
 		print '<td class="center">';
 		print $companystatic->getTypeUrl(1);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
-	if (!empty($arrayfields['s.fk_prospectlevel']['checked']))
-	{
+	if (!empty($arrayfields['s.fk_prospectlevel']['checked'])) {
 		// Prospect level
 		print '<td class="center">';
 		print $companystatic->getLibProspLevel();
 		print "</td>";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
-	if (!empty($arrayfields['s.fk_stcomm']['checked']))
-	{
+	if (!empty($arrayfields['s.fk_stcomm']['checked'])) {
 		// Prospect status
 		print '<td class="center nowrap"><div class="nowrap">';
 		print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
 		print '</div> - <div class="inline-block">';
-		foreach ($prospectstatic->cacheprospectstatus as $key => $val)
-		{
+		foreach ($prospectstatic->cacheprospectstatus as $key => $val) {
 			$titlealt = 'default';
-			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
-			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) {
+				$titlealt = $val['label'];
+			}
+			if ($obj->stcomm_id != $val['id']) {
+				print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+			}
 		}
 		print '</div></div></td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Parent company
-	if (!empty($arrayfields['s2.nom']['checked']))
-	{
+	if (!empty($arrayfields['s2.nom']['checked'])) {
 		print '<td class="center tdoverflowmax100">';
-		if ($companystatic->fk_parent > 0)
-		{
+		if ($companystatic->fk_parent > 0) {
 			$companyparent->fetch($companystatic->fk_parent);
 			print $companyparent->getNomUrl(1);
 		}
 		print "</td>";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
@@ -1314,55 +1648,65 @@ while ($i < min($num, $limit))
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['s.datec']['checked']))
-	{
+	if (!empty($arrayfields['s.datec']['checked'])) {
 		print '<td class="center nowrap">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Date modification
-	if (!empty($arrayfields['s.tms']['checked']))
-	{
+	if (!empty($arrayfields['s.tms']['checked'])) {
 		print '<td class="center nowrap">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Status
-	if (!empty($arrayfields['s.status']['checked']))
-	{
+	if (!empty($arrayfields['s.status']['checked'])) {
 		print '<td class="center nowrap">'.$companystatic->getLibStatut(5).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['s.import_key']['checked']))
-	{
+	if (!empty($arrayfields['s.import_key']['checked'])) {
 		print '<td class="tdoverflowmax100">';
 		print $obj->import_key;
 		print "</td>\n";
-		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 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->rowid, $arrayofselected)) $selected = 1;
+		if (in_array($obj->rowid, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>'."\n";
 	$i++;
 }
 
 // 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/societe/note.php b/htdocs/societe/note.php
index 516fb95e464..c9b195b9daf 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -35,11 +35,15 @@ $langs->load("companies");
 
 // Security check
 $id = GETPOST('id') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
-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);
+}
 
 $permissionnote = $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
 
@@ -61,16 +65,19 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
 $form = new Form($db);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Notes");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Notes");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name.' - '.$langs->trans("Notes");
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	/*
-     * Affichage onglets
-     */
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	 * Affichage onglets
+	 */
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 
 	$head = societe_prepare_head($object);
 
@@ -89,32 +96,31 @@ if ($object->id > 0)
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td class="'.$cssclass.'">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
-    if ($object->client) {
-        print '<tr><td class="'.$cssclass.'">';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        $tmpcheck = $object->check_codeclient();
-        if ($tmpcheck != 0 && $tmpcheck != -5) {
-        	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        }
-        print '</td></tr>';
-    }
+	if ($object->client) {
+		print '<tr><td class="'.$cssclass.'">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		$tmpcheck = $object->check_codeclient();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
+		print '</td></tr>';
+	}
 
-    if ($object->fournisseur) {
-        print '<tr><td class="'.$cssclass.'">';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        $tmpcheck = $object->check_codefournisseur();
-        if ($tmpcheck != 0 && $tmpcheck != -5) {
-        	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        }
-        print '</td></tr>';
-    }
+	if ($object->fournisseur) {
+		print '<tr><td class="'.$cssclass.'">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		$tmpcheck = $object->check_codefournisseur();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
+		print '</td></tr>';
+	}
 
 	print "</table>";
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index b911bfb034e..0459f93cbf3 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -39,16 +39,24 @@ $actionid  = GETPOST('actionid');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', '', '');
 
 $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 (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "n.daten";
-if (empty($page) || $page == -1) { $page = 0; }
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "n.daten";
+}
+if (empty($page) || $page == -1) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -68,39 +76,34 @@ $hookmanager->initHooks(array('thirdpartynotification', 'globalcard'));
 
 $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$error = 0;
 
 	// Add a notification
-	if ($action == 'add')
-	{
-		if (empty($contactid))
-		{
+	if ($action == 'add') {
+		if (empty($contactid)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
 			$error++;
 		}
-		if ($actionid <= 0)
-		{
+		if ($actionid <= 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
 			$sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
-			if ($db->query($sql))
-			{
+			if ($db->query($sql)) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
 				$sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
 
-				if (!$db->query($sql))
-				{
+				if (!$db->query($sql)) {
 					$error++;
 					dol_print_error($db);
 				}
@@ -108,8 +111,7 @@ if (empty($reshook))
 				dol_print_error($db);
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 			} else {
 				$db->rollback();
@@ -118,8 +120,7 @@ if (empty($reshook))
 	}
 
 	// Remove a notification
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST('actid', 'int');
 		$db->query($sql);
 	}
@@ -137,14 +138,15 @@ $object = new Societe($db);
 $result = $object->fetch($socid);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Notification");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name.' - '.$langs->trans("Notification");
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 
 llxHeader('', $title, $help_url);
 
 
-if ($result > 0)
-{
+if ($result > 0) {
 	$langs->load("other");
 
 	$head = societe_prepare_head($object);
@@ -161,44 +163,43 @@ if ($result > 0)
 	print '<table class="border centpercent tableforfield">';
 
 	// Prefix
-	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
-    if ($object->client) {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        $tmpcheck = $object->check_codeclient();
-        if ($tmpcheck != 0 && $tmpcheck != -5) {
-        	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        }
-        print '</td></tr>';
-    }
+	if ($object->client) {
+		print '<tr><td class="titlefield">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		$tmpcheck = $object->check_codeclient();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
+		print '</td></tr>';
+	}
 
-    if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire)) {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        $tmpcheck = $object->check_codefournisseur();
-        if ($tmpcheck != 0 && $tmpcheck != -5) {
-        	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        }
-        print '</td></tr>';
-    }
+	if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire)) {
+		print '<tr><td class="titlefield">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		$tmpcheck = $object->check_codefournisseur();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
+		print '</td></tr>';
+	}
 
 	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
-    print '<td colspan="3">';
-    $nbofrecipientemails=0;
-    $notify=new Notify($db);
-    $tmparray = $notify->getNotificationsArray('', $object->id, null, 0, array('thirdparty'));
-    foreach($tmparray as $tmpkey => $tmpval)
-    {
-        if (! empty($tmpkey)) $nbofrecipientemails++;
-    }
-    print $nbofrecipientemails;
-    print '</td></tr>';*/
+	print '<td colspan="3">';
+	$nbofrecipientemails=0;
+	$notify=new Notify($db);
+	$tmparray = $notify->getNotificationsArray('', $object->id, null, 0, array('thirdparty'));
+	foreach($tmparray as $tmpkey => $tmpval)
+	{
+		if (! empty($tmpkey)) $nbofrecipientemails++;
+	}
+	print $nbofrecipientemails;
+	print '</td></tr>';*/
 
 	print '</table>';
 
@@ -232,8 +233,7 @@ if ($result > 0)
 	$sql .= " AND c.fk_soc = ".$object->id;
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 	} else {
 		dol_print_error($db);
@@ -261,17 +261,15 @@ if ($result > 0)
 
 	// Line to add a new subscription
 	$listofemails = $object->thirdparty_and_contact_email_array();
-	if (count($listofemails) > 0)
-	{
+	if (count($listofemails) > 0) {
 		$actions = array();
 
 		// Load array of available notifications
 		$notificationtrigger = new InterfaceNotification($db);
 		$listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
 
-		foreach ($listofmanagedeventfornotification as $managedeventfornotification)
-		{
- 			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
+		foreach ($listofmanagedeventfornotification as $managedeventfornotification) {
+			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
 			$actions[$managedeventfornotification['rowid']] = $label;
 		}
 		print '<tr class="oddeven nohover">';
@@ -294,14 +292,12 @@ if ($result > 0)
 	}
 
 
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
 
 		$contactstatic = new Contact($db);
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			$contactstatic->id = $obj->contact_id;
@@ -310,10 +306,8 @@ if ($result > 0)
 
 			print '<tr class="oddeven">';
 			print '<td>'.$contactstatic->getNomUrl(1);
-			if ($obj->type == 'email')
-			{
-				if (isValidEmail($obj->email))
-				{
+			if ($obj->type == 'email') {
+				if (isValidEmail($obj->email)) {
 					print ' &lt;'.$obj->email.'&gt;';
 				} else {
 					$langs->load("errors");
@@ -326,8 +320,12 @@ if ($result > 0)
 			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
 			print '</td>';
 			print '<td>';
-			if ($obj->type == 'email') print $langs->trans("Email");
-			if ($obj->type == 'sms') print $langs->trans("SMS");
+			if ($obj->type == 'email') {
+				print $langs->trans("Email");
+			}
+			if ($obj->type == 'sms') {
+				print $langs->trans("SMS");
+			}
 			print '</td>';
 			print '<td class="right"><a href="card.php?socid='.$socid.'&action=delete&token='.newToken().'&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
 			print '</tr>';
@@ -338,9 +336,9 @@ if ($result > 0)
 
 	// List of notifications enabled for fixed email
 	/*
-    foreach($conf->global as $key => $val)
-    {
-    	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
+	foreach($conf->global as $key => $val)
+	{
+		if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
 		print '<tr class="oddeven"><td>';
 		$listtmp=explode(',',$val);
 		$first=1;
@@ -349,7 +347,7 @@ if ($result > 0)
 			if (! $first) print ', ';
 			$first=0;
 			$valemail=trim($valemail);
-    		//print $keyemail.' - '.$valemail.' - '.$reg[1].'<br>';
+			//print $keyemail.' - '.$valemail.' - '.$reg[1].'<br>';
 			if (isValidEmail($valemail, 1))
 			{
 				if ($valemail == '__SUPERVISOREMAIL__') print $valemail;
@@ -377,14 +375,14 @@ if ($result > 0)
 		print '</td>';
 		print '<td class="right">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</td>';
 		print '</tr>';
-    }*/
+	}*/
 
 	/*if ($user->admin)
-    {
+	{
 		print '<tr class="oddeven"><td colspan="4">';
 		print '+ <a href="'.DOL_URL_ROOT.'/admin/notification.php">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</a>';
 		print '</td></tr>';
-    }*/
+	}*/
 
 	print '</table>';
 	print '</div>';
@@ -406,12 +404,10 @@ if ($result > 0)
 
 	// 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;
 		}
@@ -420,19 +416,24 @@ if ($result > 0)
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 	} else {
 		dol_print_error($db);
 	}
 
 	$param = '&socid='.$object->id;
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.$contextpage;
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.$limit;
+	}
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -454,19 +455,16 @@ if ($result > 0)
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
 	print '</tr>';
 
-	if ($num > 0)
-	{
+	if ($num > 0) {
 		$i = 0;
 
 		$contactstatic = new Contact($db);
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven"><td>';
-			if ($obj->id > 0)
-			{
+			if ($obj->id > 0) {
 				$contactstatic->id = $obj->id;
 				$contactstatic->lastname = $obj->lastname;
 				$contactstatic->firstname = $obj->firstname;
@@ -481,18 +479,22 @@ if ($result > 0)
 			print $label;
 			print '</td>';
 			print '<td>';
-			if ($obj->type == 'email') print $langs->trans("Email");
-			if ($obj->type == 'sms') print $langs->trans("Sms");
+			if ($obj->type == 'email') {
+				print $langs->trans("Email");
+			}
+			if ($obj->type == 'sms') {
+				print $langs->trans("Sms");
+			}
 			print '</td>';
 			// TODO Add link to object here for other types
 			/*print '<td>';
-            if ($obj->object_type == 'order')
-            {
+			if ($obj->object_type == 'order')
+			{
 				$orderstatic->id=$obj->object_id;
 				$orderstatic->ref=...
 				print $orderstatic->getNomUrl(1);
-            }
-           	print '</td>';*/
+			}
+			   print '</td>';*/
 			// print
 			print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
 			print '</tr>';
@@ -507,7 +509,9 @@ if ($result > 0)
 	print '</div>';
 
 	print '</form>';
-} else dol_print_error('', 'RecordNotFound');
+} else {
+	dol_print_error('', 'RecordNotFound');
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 8956a80d0d8..76ddcfd873c 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -44,7 +44,9 @@ $langs->loadLangs(array("companies", "commercial", "banks", "bills", 'paypal', '
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', '', '');
 
 $id = GETPOST("id", "int");
@@ -69,12 +71,10 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $hookmanager->initHooks(array('thirdpartybancard', 'globalcard'));
 
 
-if (!empty($conf->stripe->enabled))
-{
+if (!empty($conf->stripe->enabled)) {
 	$service = 'StripeTest';
 	$servicestatus = 0;
-	if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
-	{
+	if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
 		$service = 'StripeLive';
 		$servicestatus = 1;
 	}
@@ -94,47 +94,44 @@ if (!empty($conf->stripe->enabled))
  *	Actions
  */
 
-if ($cancel)
-{
+if ($cancel) {
 	$action = '';
 }
 
 $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
-	if ($cancel)
-	{
+if (empty($reshook)) {
+	if ($cancel) {
 		$action = '';
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 	}
 
-	if ($action == 'update')
-	{
+	if ($action == 'update') {
 		// Modification
-		if (!GETPOST('label', 'alpha') || !GETPOST('bank', 'alpha'))
-		{
-			if (!GETPOST('label', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (!GETPOST('bank', 'alpha'))  setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+		if (!GETPOST('label', 'alpha') || !GETPOST('bank', 'alpha')) {
+			if (!GETPOST('label', 'alpha')) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			}
+			if (!GETPOST('bank', 'alpha')) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			}
 			$action = 'edit';
 			$error++;
 		}
-		if ($companybankaccount->needIBAN() == 1)
-		{
-			if (!GETPOST('iban'))
-			{
+		if ($companybankaccount->needIBAN() == 1) {
+			if (!GETPOST('iban')) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
 				$action = 'edit';
 				$error++;
 			}
-			if (!GETPOST('bic'))
-			{
+			if (!GETPOST('bic')) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
 				$action = 'edit';
 				$error++;
@@ -142,8 +139,7 @@ if (empty($reshook))
 		}
 
 		$companybankaccount->fetch($id);
-		if (!$error)
-		{
+		if (!$error) {
 			$companybankaccount->socid           = $object->id;
 
 			$companybankaccount->bank            = GETPOST('bank', 'alpha');
@@ -162,23 +158,19 @@ if (empty($reshook))
 			$companybankaccount->frstrecur       = GETPOST('frstrecur', 'alpha');
 			$companybankaccount->rum             = GETPOST('rum', 'alpha');
 			$companybankaccount->date_rum        = dol_mktime(0, 0, 0, GETPOST('date_rummonth'), GETPOST('date_rumday'), GETPOST('date_rumyear'));
-			if (empty($companybankaccount->rum))
-			{
+			if (empty($companybankaccount->rum)) {
 				$companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
 			}
-			if (empty($companybankaccount->date_rum))
-			{
+			if (empty($companybankaccount->date_rum)) {
 				$companybankaccount->date_rum = dol_now();
 			}
 
 			$result = $companybankaccount->update($user);
-			if (!$result)
-			{
+			if (!$result) {
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 			} else {
 				// If this account is the default bank account, we disable others
-				if ($companybankaccount->default_rib)
-				{
+				if ($companybankaccount->default_rib) {
 					$companybankaccount->setAsDefault($id); // This will make sure there is only one default rib
 				}
 
@@ -189,23 +181,26 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'updatecard')
-	{
+	if ($action == 'updatecard') {
 		// Modification
-		if (!GETPOST('label', 'alpha') || !GETPOST('proprio', 'alpha') || !GETPOST('exp_date_month', 'alpha') || !GETPOST('exp_date_year', 'alpha'))
-		{
-			if (!GETPOST('label', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (!GETPOST('proprio', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
+		if (!GETPOST('label', 'alpha') || !GETPOST('proprio', 'alpha') || !GETPOST('exp_date_month', 'alpha') || !GETPOST('exp_date_year', 'alpha')) {
+			if (!GETPOST('label', 'alpha')) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			}
+			if (!GETPOST('proprio', 'alpha')) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
+			}
 			//if (!GETPOST('cardnumber', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
-			if (!(GETPOST('exp_date_month', 'alpha') > 0) || !(GETPOST('exp_date_year', 'alpha') > 0)) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
+			if (!(GETPOST('exp_date_month', 'alpha') > 0) || !(GETPOST('exp_date_year', 'alpha') > 0)) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
+			}
 			//if (!GETPOST('cvn', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
 			$action = 'createcard';
 			$error++;
 		}
 
 		$companypaymentmode->fetch($id);
-		if (!$error)
-		{
+		if (!$error) {
 			$companypaymentmode->fk_soc          = $object->id;
 
 			$companypaymentmode->bank            = GETPOST('bank', 'alpha');
@@ -225,13 +220,11 @@ if (empty($reshook))
 			$companypaymentmode->stripe_card_ref = GETPOST('stripe_card_ref', 'alpha');
 
 			$result = $companypaymentmode->update($user);
-			if (!$result)
-			{
+			if (!$result) {
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 			} else {
 				// If this account is the default bank account, we disable others
-				if ($companypaymentmode->default_rib)
-				{
+				if ($companypaymentmode->default_rib) {
 					$companypaymentmode->setAsDefault($id); // This will make sure there is only one default rib
 				}
 
@@ -242,20 +235,21 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'add')
-	{
+	if ($action == 'add') {
 		$error = 0;
 
-		if (!GETPOST('label', 'alpha') || !GETPOST('bank', 'alpha'))
-		{
-			if (!GETPOST('label', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (!GETPOST('bank', 'alpha'))  setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+		if (!GETPOST('label', 'alpha') || !GETPOST('bank', 'alpha')) {
+			if (!GETPOST('label', 'alpha')) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			}
+			if (!GETPOST('bank', 'alpha')) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			}
 			$action = 'create';
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Ajout
 			$companybankaccount = new CompanyBankAccount($db);
 
@@ -283,52 +277,43 @@ if (empty($reshook))
 			$db->begin();
 
 			// This test can be done only once properties were set
-			if ($companybankaccount->needIBAN() == 1)
-			{
-				if (!GETPOST('iban'))
-				{
+			if ($companybankaccount->needIBAN() == 1) {
+				if (!GETPOST('iban')) {
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("IBAN")), null, 'errors');
 					$action = 'create';
 					$error++;
 				}
-				if (!GETPOST('bic'))
-				{
+				if (!GETPOST('bic')) {
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BIC")), null, 'errors');
 					$action = 'create';
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $companybankaccount->create($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 					$action = 'create'; // Force chargement page création
 				}
 
-				if (empty($companybankaccount->rum))
-				{
+				if (empty($companybankaccount->rum)) {
 					$companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
 					$companybankaccount->date_rum = dol_now();
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $companybankaccount->update($user); // This will set the UMR number.
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 					$action = 'create';
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 
 				$url = $_SERVER["PHP_SELF"].'?socid='.$object->id;
@@ -340,23 +325,26 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'addcard')
-	{
+	if ($action == 'addcard') {
 		$error = 0;
 
-		if (!GETPOST('label', 'alpha') || !GETPOST('proprio', 'alpha') || !GETPOST('exp_date_month', 'alpha') || !GETPOST('exp_date_year', 'alpha'))
-		{
-			if (!GETPOST('label', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (!GETPOST('proprio', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
+		if (!GETPOST('label', 'alpha') || !GETPOST('proprio', 'alpha') || !GETPOST('exp_date_month', 'alpha') || !GETPOST('exp_date_year', 'alpha')) {
+			if (!GETPOST('label', 'alpha')) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			}
+			if (!GETPOST('proprio', 'alpha')) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
+			}
 			//if (!GETPOST('cardnumber', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
-			if (!(GETPOST('exp_date_month', 'alpha') > 0) || !(GETPOST('exp_date_year', 'alpha') > 0)) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
+			if (!(GETPOST('exp_date_month', 'alpha') > 0) || !(GETPOST('exp_date_year', 'alpha') > 0)) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
+			}
 			//if (!GETPOST('cvn', 'alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
 			$action = 'createcard';
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Ajout
 			$companypaymentmode = new CompanyPaymentMode($db);
 
@@ -383,19 +371,16 @@ if (empty($reshook))
 
 			$db->begin();
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $companypaymentmode->create($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 					$action = 'createcard'; // Force chargement page création
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 
 				$url = $_SERVER["PHP_SELF"].'?socid='.$object->id;
@@ -407,12 +392,10 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'setasbankdefault' && GETPOST('ribid', 'int') > 0)
-	{
+	if ($action == 'setasbankdefault' && GETPOST('ribid', 'int') > 0) {
 		$companybankaccount = new CompanyBankAccount($db);
 		$res = $companybankaccount->setAsDefault(GETPOST('ribid', 'int'));
-		if ($res)
-		{
+		if ($res) {
 			$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 			header('Location: '.$url);
 			exit;
@@ -421,11 +404,9 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_deletecard' && GETPOST('confirm', 'alpha') == 'yes')
-	{
+	if ($action == 'confirm_deletecard' && GETPOST('confirm', 'alpha') == 'yes') {
 		$companypaymentmode = new CompanyPaymentMode($db);
-		if ($companypaymentmode->fetch($ribid ? $ribid : $id))
-		{
+		if ($companypaymentmode->fetch($ribid ? $ribid : $id)) {
 			/*if ($companypaymentmode->stripe_card_ref && preg_match('/pm_/', $companypaymentmode->stripe_card_ref))
 			{
 				$payment_method = \Stripe\PaymentMethod::retrieve($companypaymentmode->stripe_card_ref);
@@ -436,8 +417,7 @@ if (empty($reshook))
 			}*/
 
 			$result = $companypaymentmode->delete($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
@@ -448,14 +428,11 @@ if (empty($reshook))
 			setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 		}
 	}
-	if ($action == 'confirm_delete' && GETPOST('confirm', 'alpha') == 'yes')
-	{
+	if ($action == 'confirm_delete' && GETPOST('confirm', 'alpha') == 'yes') {
 		$companybankaccount = new CompanyBankAccount($db);
-		if ($companybankaccount->fetch($ribid ? $ribid : $id))
-		{
+		if ($companybankaccount->fetch($ribid ? $ribid : $id)) {
 			$result = $companybankaccount->delete($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
@@ -470,8 +447,7 @@ if (empty($reshook))
 	$savid = $id;
 
 	// Actions to build doc
-	if ($action == 'builddocrib')
-	{
+	if ($action == 'builddocrib') {
 		$action = 'builddoc';
 		$moreparams = array(
 			'use_companybankid'=>GETPOST('companybankid'),
@@ -489,19 +465,15 @@ if (empty($reshook))
 	$id = $savid;
 
 	// Action for stripe
-	if (!empty($conf->stripe->enabled) && class_exists('Stripe'))
-	{
-		if ($action == 'synccustomertostripe')
-		{
-			if ($object->client == 0)
-			{
+	if (!empty($conf->stripe->enabled) && class_exists('Stripe')) {
+		if ($action == 'synccustomertostripe') {
+			if ($object->client == 0) {
 				$error++;
 				setEventMessages('ThisThirdpartyIsNotACustomer', null, 'errors');
 			} else {
 				// Creation of Stripe customer + update of societe_account
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus, 1);
-				if (!$cu)
-				{
+				if (!$cu) {
 					$error++;
 					setEventMessages($stripe->error, $stripe->errors, 'errors');
 				} else {
@@ -509,32 +481,27 @@ if (empty($reshook))
 				}
 			}
 		}
-		if ($action == 'synccardtostripe')
-		{
+		if ($action == 'synccardtostripe') {
 			$companypaymentmode = new CompanyPaymentMode($db);
 			$companypaymentmode->fetch($id);
 
-			if ($companypaymentmode->type != 'card')
-			{
+			if ($companypaymentmode->type != 'card') {
 				$error++;
 				setEventMessages('ThisPaymentModeIsNotACard', null, 'errors');
 			} else {
 				// Get the Stripe customer
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				if (!$cu)
-				{
+				if (!$cu) {
 					$error++;
 					setEventMessages($stripe->error, $stripe->errors, 'errors');
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Creation of Stripe card + update of societe_account
 					// Note that with the new Stripe API, option to create a card is no more available, instead an error message will be returned to
 					// ask to create the crdit card from Stripe backoffice.
 					$card = $stripe->cardStripe($cu, $companypaymentmode, $stripeacc, $servicestatus, 1);
-					if (!$card)
-					{
+					if (!$card) {
 						$error++;
 						setEventMessages($stripe->error, $stripe->errors, 'errors');
 					}
@@ -542,8 +509,7 @@ if (empty($reshook))
 			}
 		}
 
-		if ($action == 'setkey_account')
-		{
+		if ($action == 'setkey_account') {
 			$error = 0;
 
 			$newcu = GETPOST('key_account', 'alpha');
@@ -560,8 +526,7 @@ if (empty($reshook))
 			$resql = $db->query($sql);
 			$num = $db->num_rows($resql); // Note: $num is always 0 on an update and delete, it is defined for select only.
 			if (!empty($newcu)) {
-				if (empty($num))
-				{
+				if (empty($num)) {
 					$societeaccount = new SocieteAccount($db);
 					$societeaccount->fk_soc = $object->id;
 					$societeaccount->login = '';
@@ -571,8 +536,7 @@ if (empty($reshook))
 					$societeaccount->key_account = $newcu;
 					$societeaccount->site_account = $site_account;
 					$result = $societeaccount->create($user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				} else {
@@ -584,8 +548,7 @@ if (empty($reshook))
 			}
 			//var_dump($sql);	var_dump($newcu);		var_dump($num); exit;
 
-			if (!$error)
-			{
+			if (!$error) {
 				$stripecu = $newcu;
 				$db->commit();
 			} else {
@@ -593,8 +556,7 @@ if (empty($reshook))
 			}
 		}
 
-		if ($action == 'setkey_account_supplier')
-		{
+		if ($action == 'setkey_account_supplier') {
 			$error = 0;
 
 			$newsup = GETPOST('key_account_supplier', 'alpha');
@@ -623,8 +585,7 @@ if (empty($reshook))
 
 			$resql = $db->query($sql);
 			$num = $db->num_rows($resql);
-			if (empty($num) && !empty($newsup))
-			{
+			if (empty($num) && !empty($newsup)) {
 				try {
 					$stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
 					$tokenstring['stripe_user_id'] = $stripesup->id;
@@ -639,8 +600,7 @@ if (empty($reshook))
 				$resql = $db->query($sql);
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$stripesupplieracc = $newsup;
 				$db->commit();
 			} else {
@@ -648,25 +608,21 @@ if (empty($reshook))
 			}
 		}
 
-		if ($action == 'setlocalassourcedefault')	// Set as default when payment mode defined locally (and may be also remotely)
-		{
+		if ($action == 'setlocalassourcedefault') {	// Set as default when payment mode defined locally (and may be also remotely)
 			try {
 				$companypaymentmode->setAsDefault($id);
 
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		} elseif ($action == 'setassourcedefault')	// Set as default when payment mode defined remotely only
-		{
+		} elseif ($action == 'setassourcedefault') {	// Set as default when payment mode defined remotely only
 			try {
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				if (preg_match('/pm_/', $source))
-				{
+				if (preg_match('/pm_/', $source)) {
 					$cu->invoice_settings->default_payment_method = (string) $source; // New
 				} else {
 					$cu->default_source = (string) $source; // Old
@@ -676,19 +632,15 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		} elseif ($action == 'deletecard' && $source)
-		{
+		} elseif ($action == 'deletecard' && $source) {
 			try {
-				if (preg_match('/pm_/', $source))
-				{
+				if (preg_match('/pm_/', $source)) {
 					$payment_method = \Stripe\PaymentMethod::retrieve($source, array("stripe_account" => $stripeacc));
-					if ($payment_method)
-					{
+					if ($payment_method) {
 						$payment_method->detach();
 					}
 				} else {
@@ -707,8 +659,7 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
@@ -735,54 +686,53 @@ $head = societe_prepare_head($object);
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Paypal'),'','warning');
 }*/
-if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')))
-{
+if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
 
 // Load Bank account
-if (!$id)
-{
+if (!$id) {
 	$companybankaccount->fetch(0, $object->id);
 	$companypaymentmode->fetch(0, null, $object->id, 'card');
 } else {
 	$companybankaccount->fetch($id);
 	$companypaymentmode->fetch($id);
 }
-if (empty($companybankaccount->socid)) $companybankaccount->socid = $object->id;
+if (empty($companybankaccount->socid)) {
+	$companybankaccount->socid = $object->id;
+}
 
-if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer)
-{
+if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer) {
 	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	$actionforadd = 'update';
-	if ($action == 'editcard') $actionforadd = 'updatecard';
+	if ($action == 'editcard') {
+		$actionforadd = 'updatecard';
+	}
 	print '<input type="hidden" name="action" value="'.$actionforadd.'">';
 	print '<input type="hidden" name="id" value="'.GETPOST("id", "int").'">';
 }
-if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights->societe->creer)
-{
+if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights->societe->creer) {
 	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	$actionforadd = 'add';
-	if ($action == 'createcard') $actionforadd = 'addcard';
+	if ($action == 'createcard') {
+		$actionforadd = 'addcard';
+	}
 	print '<input type="hidden" name="action" value="'.$actionforadd.'">';
 }
 
 
 // View
-if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' && $action != 'createcard')
-{
+if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard' && $action != 'createcard') {
 	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), -1, 'company');
 
 	// Confirm delete ban
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid ? $ribid : $id), $langs->trans("DeleteARib"), $langs->trans("ConfirmDeleteRib", $companybankaccount->getRibLabel()), "confirm_delete", '', 0, 1);
 	}
 	// Confirm delete card
-	if ($action == 'deletecard')
-	{
+	if ($action == 'deletecard') {
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".$object->id."&ribid=".($ribid ? $ribid : $id), $langs->trans("DeleteACard"), $langs->trans("ConfirmDeleteCard", $companybankaccount->getRibLabel()), "confirm_deletecard", '', 0, 1);
 	}
 
@@ -791,8 +741,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
 
-	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
@@ -803,8 +752,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border tableforfield centpercent">';
 
-	if ($object->client)
-	{
+	if ($object->client) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="2">';
 		print $object->code_client;
@@ -815,38 +763,46 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '</td></tr>';
 		$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
 		$resql = $db->query($sql);
-		if (!$resql) dol_print_error($db);
+		if (!$resql) {
+			dol_print_error($db);
+		}
 
 		$obj = $db->fetch_object($resql);
 		$nbFactsClient = $obj->nb;
 		$thirdTypeArray['customer'] = $langs->trans("customer");
-		if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
-		if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
-		if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
-		if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
+		if ($conf->propal->enabled && $user->rights->propal->lire) {
+			$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
+		}
+		if ($conf->commande->enabled && $user->rights->commande->lire) {
+			$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
+		}
+		if ($conf->facture->enabled && $user->rights->facture->lire) {
+			$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
+		}
+		if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+			$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
+		}
 
-		if (!empty($conf->stripe->enabled))
-		{
+		if (!empty($conf->stripe->enabled)) {
 			$permissiontowrite = $user->rights->societe->creer;
 			// Stripe customer key 'cu_....' stored into llx_societe_account
 			print '<tr><td class="titlefield">';
 			print $form->editfieldkey("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', 0, 2, 'socid');
 			print '</td><td>';
 			print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
-			if (!empty($conf->stripe->enabled) && $stripecu && $action != 'editkey_account')
-			{
+			if (!empty($conf->stripe->enabled) && $stripecu && $action != 'editkey_account') {
 				$connect = '';
-				if (!empty($stripeacc)) $connect = $stripeacc.'/';
+				if (!empty($stripeacc)) {
+					$connect = $stripeacc.'/';
+				}
 				$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$stripecu;
-				if ($servicestatus)
-				{
+				if ($servicestatus) {
 					$url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$stripecu;
 				}
 				print ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe').' - Publishable key = '.$site_account, 'globe').'</a>';
 			}
 			print '</td><td class="right">';
-			if (empty($stripecu))
-			{
+			if (empty($stripecu)) {
 				print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 				print '<input type="hidden" name="action" value="synccustomertostripe">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -858,8 +814,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 	}
 
-	if ($object->fournisseur)
-	{
+	if ($object->fournisseur) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="2">';
 		print $object->code_fournisseur;
@@ -870,18 +825,27 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '</td></tr>';
 		$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
 		$resql = $db->query($sql);
-		if (!$resql) dol_print_error($db);
+		if (!$resql) {
+			dol_print_error($db);
+		}
 		$obj = $db->fetch_object($resql);
 		$nbFactsClient = $obj->nb;
 		$thirdTypeArray['customer'] = $langs->trans("customer");
-		if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
-		if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
-		if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
-		if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
+		if ($conf->propal->enabled && $user->rights->propal->lire) {
+			$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
+		}
+		if ($conf->commande->enabled && $user->rights->commande->lire) {
+			$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
+		}
+		if ($conf->facture->enabled && $user->rights->facture->lire) {
+			$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
+		}
+		if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+			$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
+		}
 	}
 
-	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
-	{
+	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		$permissiontowrite = $user->rights->societe->creer;
 		$stripesupplieracc = $stripe->getStripeAccount($service, $object->id); // Get Stripe OAuth connect account (no network access here)
 
@@ -890,20 +854,17 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print $form->editfieldkey("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontowrite, 'string', '', 0, 2, 'socid');
 		print '</td><td>';
 		print $form->editfieldval("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
-		if (!empty($conf->stripe->enabled) && $stripesupplieracc && $action != 'editkey_account_supplier')
-		{
+		if (!empty($conf->stripe->enabled) && $stripesupplieracc && $action != 'editkey_account_supplier') {
 			$connect = '';
 
 			$url = 'https://dashboard.stripe.com/test/connect/accounts/'.$stripesupplieracc;
-			if ($servicestatus)
-			{
+			if ($servicestatus) {
 				$url = 'https://dashboard.stripe.com/connect/accounts/'.$stripesupplieracc;
 			}
 			print ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe').' - Publishable key '.$site_account, 'globe').'</a>';
 		}
 		print '</td><td class="right">';
-		if (empty($stripesupplieracc))
-		{
+		if (empty($stripesupplieracc)) {
 			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input type="hidden" name="action" value="syncsuppliertostripe">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -923,30 +884,25 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	print '<br>';
 
 	// List of Stripe payment modes
-	if (!(empty($conf->stripe->enabled)) && $object->client)
-	{
+	if (!(empty($conf->stripe->enabled)) && $object->client) {
 		$morehtmlright = '';
-		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
-		{
+		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
 			$morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
 		}
 		print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
 
 		$listofsources = array();
-		if (is_object($stripe))
-		{
+		if (is_object($stripe)) {
 			try {
 				$customerstripe = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				if (!empty($customerstripe->id)) {
 					// When using the Charge API architecture
-					if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-					{
+					if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
 						$listofsources = $customerstripe->sources->data;
 					} else {
 						$service = 'StripeTest';
 						$servicestatus = 0;
-						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
-						{
+						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
 							$service = 'StripeLive';
 							$servicestatus = 1;
 						}
@@ -964,18 +920,20 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								$paymentmethodobjsB = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "sepa_debit"), array("stripe_account" => $stripeacc));
 							}
 
-							if ($paymentmethodobjsA->data != null && $paymentmethodobjsB->data != null) { $listofsources = array_merge((array) $paymentmethodobjsA->data, (array) $paymentmethodobjsB->data);
-							} elseif ($paymentmethodobjsB->data != null) { $listofsources = $paymentmethodobjsB->data; }
-							else { $listofsources = $paymentmethodobjsA->data; }
-						} catch (Exception $e)
-						{
+							if ($paymentmethodobjsA->data != null && $paymentmethodobjsB->data != null) {
+								$listofsources = array_merge((array) $paymentmethodobjsA->data, (array) $paymentmethodobjsB->data);
+							} elseif ($paymentmethodobjsB->data != null) {
+								$listofsources = $paymentmethodobjsB->data;
+							} else {
+								$listofsources = $paymentmethodobjsA->data;
+							}
+						} catch (Exception $e) {
 							$error++;
 							setEventMessages($e->getMessage(), null, 'errors');
 						}
 					}
 				}
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				dol_syslog("Error when searching/loading Stripe customer for thirdparty id =".$object->id);
 			}
 		}
@@ -984,8 +942,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		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">'."\n";
 		print '<tr class="liste_titre">';
-		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
-		{
+		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
 			print '<td>'.$langs->trans('LocalID').'</td>';
 		}
 		print '<td>'.$langs->trans('Label').'</td>';
@@ -1009,8 +966,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$arrayofstripecard = array();
 
 		// Show local sources
-		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
-		{
+		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
 			//$societeaccount = new SocieteAccount($db);
 			$companypaymentmodetemp = new CompanyPaymentMode($db);
 
@@ -1020,19 +976,15 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			$sql .= " AND status = ".$servicestatus;
 
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num_rows = $db->num_rows($resql);
-				if ($num_rows)
-				{
+				if ($num_rows) {
 					$i = 0;
-					while ($i < $num_rows)
-					{
+					while ($i < $num_rows) {
 						$nblocal++;
 
 						$obj = $db->fetch_object($resql);
-						if ($obj)
-						{
+						if ($obj) {
 							$companypaymentmodetemp->fetch($obj->rowid);
 
 							$arrayofstripecard[$companypaymentmodetemp->stripe_card_ref] = $companypaymentmodetemp->stripe_card_ref;
@@ -1046,13 +998,13 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print '</td>';
 							print '<td>';
 							print $companypaymentmodetemp->stripe_card_ref;
-							if ($companypaymentmodetemp->stripe_card_ref)
-							{
+							if ($companypaymentmodetemp->stripe_card_ref) {
 								$connect = '';
-								if (!empty($stripeacc)) $connect = $stripeacc.'/';
+								if (!empty($stripeacc)) {
+									$connect = $stripeacc.'/';
+								}
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$companypaymentmodetemp->stripe_card_ref;
-								if ($servicestatus)
-								{
+								if ($servicestatus) {
 									$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$companypaymentmodetemp->stripe_card_ref;
 								}
 								print ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe').' - Customer and Publishable key = '.$companypaymentmodetemp->stripe_account, 'globe').'</a>';
@@ -1062,21 +1014,27 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print img_credit_card($companypaymentmodetemp->type);
 							print '</td>';
 							print '<td>';
-							if ($companypaymentmodetemp->proprio) print '<span class="opacitymedium">'.$companypaymentmodetemp->proprio.'</span><br>';
-							if ($companypaymentmodetemp->last_four) print '....'.$companypaymentmodetemp->last_four;
-							if ($companypaymentmodetemp->exp_date_month || $companypaymentmodetemp->exp_date_year) print ' - '.sprintf("%02d", $companypaymentmodetemp->exp_date_month).'/'.$companypaymentmodetemp->exp_date_year.'';
+							if ($companypaymentmodetemp->proprio) {
+								print '<span class="opacitymedium">'.$companypaymentmodetemp->proprio.'</span><br>';
+							}
+							if ($companypaymentmodetemp->last_four) {
+								print '....'.$companypaymentmodetemp->last_four;
+							}
+							if ($companypaymentmodetemp->exp_date_month || $companypaymentmodetemp->exp_date_year) {
+								print ' - '.sprintf("%02d", $companypaymentmodetemp->exp_date_month).'/'.$companypaymentmodetemp->exp_date_year.'';
+							}
 							print '</td><td>';
-							if ($companypaymentmodetemp->country_code)
-							{
+							if ($companypaymentmodetemp->country_code) {
 								$img = picto_from_langcode($companypaymentmodetemp->country_code);
 								print $img ? $img.' ' : '';
 								print getCountry($companypaymentmodetemp->country_code, 1);
-							} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+							} else {
+								print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+							}
 							print '</td>';
 							// Default
 							print '<td class="center">';
-							if (empty($companypaymentmodetemp->default_rib))
-							{
+							if (empty($companypaymentmodetemp->default_rib)) {
 								print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=setlocalassourcedefault&token='.newToken().'">';
 								print img_picto($langs->trans("Default"), 'off');
 								print '</a>';
@@ -1085,8 +1043,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							}
 							print '</td>';
 							print '<td>';
-							if (empty($companypaymentmodetemp->stripe_card_ref)) print $langs->trans("Local");
-							else print $langs->trans("LocalAndRemote");
+							if (empty($companypaymentmodetemp->stripe_card_ref)) {
+								print $langs->trans("Local");
+							} else {
+								print $langs->trans("LocalAndRemote");
+							}
 							print '</td>';
 							print '<td>';
 							print dol_print_date($companypaymentmodetemp->tms, 'dayhour');
@@ -1097,10 +1058,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print $hookmanager->resPrint;
 							// Action column
 							print '<td class="right nowraponall">';
-							if ($user->rights->societe->creer)
-							{
-								if ($stripecu && empty($companypaymentmodetemp->stripe_card_ref))
-								{
+							if ($user->rights->societe->creer) {
+								if ($stripecu && empty($companypaymentmodetemp->stripe_card_ref)) {
 									print '<a href="'.$_SERVER['PHP_SELF'].'?action=synccardtostripe&socid='.$object->id.'&id='.$companypaymentmodetemp->id.'" class="paddingrightonly marginrightonly">'.$langs->trans("CreateCardOnStripe").'</a>';
 								}
 
@@ -1126,7 +1085,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		// Show remote sources (not already shown as local source)
 		if (is_array($listofsources) && count($listofsources)) {
 			foreach ($listofsources as $src) {
-				if (!empty($arrayofstripecard[$src->id])) continue; // Already in previous list
+				if (!empty($arrayofstripecard[$src->id])) {
+					continue; // Already in previous list
+				}
 
 				$nbremote++;
 
@@ -1142,7 +1103,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print '<td>';
 				$connect = '';
 				print $src->id;
-				if (!empty($stripeacc)) $connect = $stripeacc.'/';
+				if (!empty($stripeacc)) {
+					$connect = $stripeacc.'/';
+				}
 				//$url='https://dashboard.stripe.com/'.$connect.'test/sources/'.$src->id;
 				$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$src->id;
 				if ($servicestatus) {
@@ -1174,16 +1137,20 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->country, 1);
-					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					} else {
+						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					}
 				} elseif ($src->object == 'source' && $src->type == 'card') {
 					print '<span class="opacitymedium">'.$src->owner->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
 
-				 	if ($src->card->country) {
+					if ($src->card->country) {
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
-					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					} else {
+						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					}
 				} elseif ($src->object == 'source' && $src->type == 'sepa_debit') {
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->sepa_debit->last4;
 					print '</td><td>';
@@ -1191,7 +1158,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							$img = picto_from_langcode($src->sepa_debit->country);
 							print $img ? $img.' ' : '';
 							print getCountry($src->sepa_debit->country, 1);
-					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					} else {
+						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					}
 				} elseif ($src->object == 'payment_method' && $src->type == 'card') {
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
@@ -1200,7 +1169,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
-					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					} else {
+						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					}
 				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit') {
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->sepa_debit->last4;
 					print '</td><td>';
@@ -1208,7 +1179,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->sepa_debit->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->sepa_debit->country, 1);
-					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					} else {
+						print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+					}
 				} else {
 					print '</td><td>';
 				}
@@ -1258,9 +1231,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '<br>';
 	}
 
-  	// List of Stripe payment modes
-	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && !empty($stripesupplieracc))
-	{
+	// List of Stripe payment modes
+	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && !empty($stripesupplieracc)) {
 		print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
 		$balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
 		print '<table class="liste centpercent">'."\n";
@@ -1272,10 +1244,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '</tr>';
 
 		$currencybalance = array();
-		if (is_array($balance->available) && count($balance->available))
-		{
-			foreach ($balance->available as $cpt)
-			{
+		if (is_array($balance->available) && count($balance->available)) {
+			foreach ($balance->available as $cpt) {
 				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
 				if (!in_array($cpt->currency, $arrayzerounitcurrency)) {
 						$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
@@ -1286,10 +1256,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-		if (is_array($balance->pending) && count($balance->pending))
-		{
-			foreach ($balance->pending as $cpt)
-			{
+		if (is_array($balance->pending) && count($balance->pending)) {
+			foreach ($balance->pending as $cpt) {
 				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
 				if (!in_array($cpt->currency, $arrayzerounitcurrency)) {
 					$currencybalance[$cpt->currency]['pending'] = $currencybalance[$cpt->currency]['available'] + $cpt->amount / 100;
@@ -1299,10 +1267,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-		if (is_array($currencybalance))
-		{
-			foreach ($currencybalance as $cpt)
-			{
+		if (is_array($currencybalance)) {
+			foreach ($currencybalance as $cpt) {
 				print '<tr><td>'.$langs->trans("Currency".strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'], 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price($cpt->pending, 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'] + $cpt->pending, 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td></tr>';
 			}
 		}
@@ -1318,8 +1284,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank');
 
 	$rib_list = $object->get_all_rib();
-	if (is_array($rib_list))
-	{
+	if (is_array($rib_list)) {
 		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">';
 
@@ -1329,8 +1294,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print_liste_field_titre("RIB");
 		print_liste_field_titre("IBAN");
 		print_liste_field_titre("BIC");
-		if (!empty($conf->prelevement->enabled))
-		{
+		if (!empty($conf->prelevement->enabled)) {
 			print_liste_field_titre("RUM");
 			print_liste_field_titre("DateRUM");
 			print_liste_field_titre("WithdrawMode");
@@ -1340,8 +1304,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
 		print "</tr>\n";
 
-		foreach ($rib_list as $rib)
-		{
+		foreach ($rib_list as $rib) {
 			print '<tr class="oddeven">';
 			// Label
 			print '<td>'.$rib->label.'</td>';
@@ -1379,7 +1342,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '</td>';
 			// IBAN
 			print '<td>'.$rib->iban;
-   			if (!empty($rib->iban)) {
+			if (!empty($rib->iban)) {
 				if (!checkIbanForAccount($rib)) {
 					print ' '.img_picto($langs->trans("IbanNotValid"), 'warning');
 				}
@@ -1394,8 +1357,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 			print '</td>';
 
-			if (!empty($conf->prelevement->enabled))
-			{
+			if (!empty($conf->prelevement->enabled)) {
 				// RUM
 				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
 				print '<td>'.$rib->rum.'</td>';
@@ -1427,46 +1389,52 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			$modellist = ModeleBankAccountDoc::liste_modeles($db);
 
 			$out = '';
-			if (is_array($modellist) && count($modellist))
-			{
+			if (is_array($modellist) && count($modellist)) {
 				$out .= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
 				$out .= '<input type="hidden" name="action" value="builddocrib">';
 				$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$out .= '<input type="hidden" name="socid" value="'.$object->id.'">';
 				$out .= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
 
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-				{
+				if (is_array($modellist) && count($modellist) == 1) {    // If there is only one element
 					$arraykeys = array_keys($modellist);
 					$modelselected = $arraykeys[0];
 				}
-				if (!empty($conf->global->BANKADDON_PDF)) $modelselected = $conf->global->BANKADDON_PDF;
+				if (!empty($conf->global->BANKADDON_PDF)) {
+					$modelselected = $conf->global->BANKADDON_PDF;
+				}
 
 				$out .= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 				$out .= ajax_combobox('modelrib'.$rib->id);
 
 				// Language code (if multilang)
-				if ($conf->global->MAIN_MULTILANGS)
-				{
+				if ($conf->global->MAIN_MULTILANGS) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 					$formadmin = new FormAdmin($db);
 					$defaultlang = $codelang ? $codelang : $langs->getDefaultLang();
 					$morecss = 'maxwidth150';
-					if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';
+					if ($conf->browser->layout == 'phone') {
+						$morecss = 'maxwidth100';
+					}
 					$out .= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, 0, 0, 0, 0, $morecss);
 				}
 				// Button
 				$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
 				$genbutton .= ' type="submit" value="'.$buttonlabel.'"';
-				if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) $genbutton .= ' disabled';
+				if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) {
+					$genbutton .= ' disabled';
+				}
 				$genbutton .= '>';
-				if ($allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
-				{
+				if ($allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {
 					$langs->load("errors");
 					$genbutton .= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
 				}
-				if (!$allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton = '';
-				if (empty($modellist) && !$showempty && $modulepart != 'unpaid') $genbutton = '';
+				if (!$allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {
+					$genbutton = '';
+				}
+				if (empty($modellist) && !$showempty && $modulepart != 'unpaid') {
+					$genbutton = '';
+				}
 				$out .= $genbutton;
 				$out .= '</form>';
 			}
@@ -1475,25 +1443,25 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 			// Edit/Delete
 			print '<td class="right nowraponall">';
-			if ($user->rights->societe->creer)
-			{
+			if ($user->rights->societe->creer) {
 				print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
 				print img_picto($langs->trans("Modify"), 'edit');
 				print '</a>';
 
-		   		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=delete&token='.newToken().'">';
-		   		print img_picto($langs->trans("Delete"), 'delete');
-		   		print '</a>';
+				print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=delete&token='.newToken().'">';
+				print img_picto($langs->trans("Delete"), 'delete');
+				print '</a>';
 			}
 			print '</td>';
 
 			print '</tr>';
 		}
 
-		if (count($rib_list) == 0)
-		{
+		if (count($rib_list) == 0) {
 			$colspan = 9;
-			if (!empty($conf->prelevement->enabled)) $colspan += 2;
+			if (!empty($conf->prelevement->enabled)) {
+				$colspan += 2;
+			}
 			print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
 		}
 
@@ -1504,16 +1472,15 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	}
 
 
-	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-	{
+	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) {
 		print '<br>';
 
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
 		/*
-         * Documents generes
-         */
+		 * Documents generes
+		 */
 		$filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
 		$urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
 		$genallowed = $user->rights->societe->lire;
@@ -1522,8 +1489,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
 
 		// Show direct download link
-		if (!empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD))
-		{
+		if (!empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
 			$companybankaccounttemp = new CompanyBankAccount($db);
 			$companypaymentmodetemp = new CompanyPaymentMode($db);
 			$result = $companypaymentmodetemp->fetch(0, null, $object->id, 'ban');
@@ -1531,8 +1497,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 			$ecmfile = new EcmFiles($db);
 			$result = $ecmfile->fetch(0, '', '', '', '', $companybankaccounttemp->table_element, $companypaymentmodetemp->id);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$companybankaccounttemp->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
 				print '<br><!-- Link to download main doc -->'."\n";
 				print showDirectDownloadLink($companybankaccounttemp).'<br>';
@@ -1547,29 +1512,28 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '<br>';
 	}
 	/*
-    include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
-    $modellist=ModeleBankAccountDoc::liste_modeles($db);
-    //print '<td>';
-    if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-    {
-        $arraykeys=array_keys($modellist);
-        $modelselected=$arraykeys[0];
-    }
-    $out.= $form->selectarray('model', $modellist, $modelselected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-    $out.= ajax_combobox('model');
-    //print $out;
-    $buttonlabel=$langs->trans("Generate");
-    $genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-    $genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-    $genbutton.= '>';
-    print $genbutton;
-    //print '</td>';     // TODO Add link to generate doc
-    */
+	include_once DOL_DOCUMENT_ROOT.'/core/modules/bank/modules_bank.php';
+	$modellist=ModeleBankAccountDoc::liste_modeles($db);
+	//print '<td>';
+	if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+	{
+		$arraykeys=array_keys($modellist);
+		$modelselected=$arraykeys[0];
+	}
+	$out.= $form->selectarray('model', $modellist, $modelselected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+	$out.= ajax_combobox('model');
+	//print $out;
+	$buttonlabel=$langs->trans("Generate");
+	$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+	$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
+	$genbutton.= '>';
+	print $genbutton;
+	//print '</td>';     // TODO Add link to generate doc
+	*/
 }
 
 // Edit BAN
-if ($socid && $action == 'edit' && $user->rights->societe->creer)
-{
+if ($socid && $action == 'edit' && $user->rights->societe->creer) {
 	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -1611,13 +1575,17 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 			$name = 'iban';
 			$size = 30;
 			$content = $companybankaccount->iban;
-			if ($companybankaccount->needIBAN()) $require = true;
+			if ($companybankaccount->needIBAN()) {
+				$require = true;
+			}
 			$tooltip = $langs->trans("Example").':<br>LT12 1000 0111 0100 1000<br>FR14 2004 1010 0505 0001 3M02 606<br>LU28 0019 4006 4475 0000<br>DE89 3704 0044 0532 0130 00';
 		} elseif ($val == 'BIC') {
 			$name = 'bic';
 			$size = 12;
 			$content = $companybankaccount->bic;
-			if ($companybankaccount->needIBAN()) $require = true;
+			if ($companybankaccount->needIBAN()) {
+				$require = true;
+			}
 			$tooltip = $langs->trans("Example").': LIABLT2XXXX';
 		}
 
@@ -1649,14 +1617,15 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 	print '</table>';
 	print '</div>';
 
-	if ($conf->prelevement->enabled)
-	{
+	if ($conf->prelevement->enabled) {
 		print '<br>';
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="border centpercent">';
 
-		if (empty($companybankaccount->rum)) $companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
+		if (empty($companybankaccount->rum)) {
+			$companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
+		}
 
 		// RUM
 		print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
@@ -1685,8 +1654,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer)
 }
 
 // Edit Card
-if ($socid && $action == 'editcard' && $user->rights->societe->creer)
-{
+if ($socid && $action == 'editcard' && $user->rights->societe->creer) {
 	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -1733,8 +1701,7 @@ if ($socid && $action == 'editcard' && $user->rights->societe->creer)
 
 
 // Create BAN
-if ($socid && $action == 'create' && $user->rights->societe->creer)
-{
+if ($socid && $action == 'create' && $user->rights->societe->creer) {
 	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -1776,13 +1743,17 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 			$name = 'iban';
 			$size = 30;
 			$content = $companybankaccount->iban;
-			if ($companybankaccount->needIBAN()) $require = true;
+			if ($companybankaccount->needIBAN()) {
+				$require = true;
+			}
 			$tooltip = $langs->trans("Example").':<br>LT12 1000 0111 0100 1000<br>FR14 2004 1010 0505 0001 3M02 606<br>LU28 0019 4006 4475 0000<br>DE89 3704 0044 0532 0130 00';
 		} elseif ($val == 'BIC') {
 			$name = 'bic';
 			$size = 12;
 			$content = $companybankaccount->bic;
-			if ($companybankaccount->needIBAN()) $require = true;
+			if ($companybankaccount->needIBAN()) {
+				$require = true;
+			}
 			$tooltip = $langs->trans("Example").': LIABLT2XXXX';
 		}
 
@@ -1813,8 +1784,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 
 	print '</table>';
 
-	if ($conf->prelevement->enabled)
-	{
+	if ($conf->prelevement->enabled) {
 		print '<br>';
 
 		print '<table class="border centpercent">';
@@ -1848,8 +1818,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer)
 }
 
 // Create Card
-if ($socid && $action == 'createcard' && $user->rights->societe->creer)
-{
+if ($socid && $action == 'createcard' && $user->rights->societe->creer) {
 	print dol_get_fiche_head($head, 'rib', $langs->trans("ThirdParty"), 0, 'company');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -1897,12 +1866,10 @@ if ($socid && $action == 'createcard' && $user->rights->societe->creer)
 	print '</div>';
 }
 
-if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer)
-{
+if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer) {
 	print '</form>';
 }
-if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights->societe->creer)
-{
+if ($socid && ($action == 'create' || $action == 'createcard') && $user->rights->societe->creer) {
 	print '</form>';
 }
 
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index dfcfde06c6c..a101f74258f 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -49,8 +49,9 @@ $search_price_ttc = GETPOST('search_price_ttc');
 
 // Security check
 $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
-if ($user->socid)
+if ($user->socid) {
 	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $object = new Societe($db);
@@ -67,12 +68,12 @@ $error = 0;
 
 $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
-	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 (empty($reshook)) {
+	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_prod = $search_label = $search_price = $search_price_ttc = '';
 	}
 
@@ -102,8 +103,7 @@ if (empty($reshook))
 			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
 			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
 			// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
-			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) {
 				// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
 				$vatratecode = $reg[1];
 				// Get record from code
@@ -113,8 +113,7 @@ if (empty($reshook))
 				$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
 				$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $db->fetch_object($resql);
 					$npr = $obj->recuperableonly;
 					$localtax1 = $obj->localtax1;
@@ -193,8 +192,9 @@ $object = new Societe($db);
 $result = $object->fetch($socid);
 llxHeader("", $langs->trans("ThirdParty").'-'.$langs->trans('PriceByCustomer'));
 
-if (!empty($conf->notification->enabled))
+if (!empty($conf->notification->enabled)) {
 	$langs->load("mails");
+}
 $head = societe_prepare_head($object);
 
 print dol_get_fiche_head($head, 'price', $langs->trans("ThirdParty"), -1, 'company');
@@ -208,8 +208,7 @@ print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 print '<table class="border centpercent">';
 
-if (!empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
-{
+if (!empty($conf->global->SOCIETE_USEPREFIX)) { // Old not used prefix field
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
@@ -250,14 +249,18 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	$sortorder = GETPOST("sortorder", 'alpha');
 	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+	if (empty($page) || $page == -1) {
+		$page = 0;
+	}     // If $page is not defined, or '' or -1
 	$offset = $limit * $page;
 	$pageprev = $page - 1;
 	$pagenext = $page + 1;
-	if (!$sortorder)
+	if (!$sortorder) {
 		$sortorder = "ASC";
-	if (!$sortfield)
+	}
+	if (!$sortfield) {
 		$sortfield = "soc.nom";
+	}
 
 		// Build filter to display only concerned lines
 	$filter = array(
@@ -365,8 +368,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print load_fiche_titre($langs->trans('PriceByCustomer'));
 
 		$result = $prodcustprice->fetch(GETPOST('lineid', 'int'));
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 		}
 
@@ -457,8 +459,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		}
 
 		$result = $prodcustprice->fetch_all_log($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 		}
 
@@ -537,14 +538,12 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-		{
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			$nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
 		}
 
 		$result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 		}
 
@@ -575,8 +574,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<td>&nbsp;</td>';
 		print '</tr>';
 
-		if (count($prodcustprice->lines) > 0 || $search_prod)
-		{
+		if (count($prodcustprice->lines) > 0 || $search_prod) {
 			print '<tr class="liste_titre">';
 			print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="'.$search_prod.'" size="20"></td>';
 			print '<td class="liste_titre" ><input type="text" class="flat" name="search_label" value="'.$search_label.'" size="20"></td>';
@@ -592,10 +590,8 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			print '</tr>';
 		}
 
-		if (count($prodcustprice->lines) > 0)
-		{
-			foreach ($prodcustprice->lines as $line)
-			{
+		if (count($prodcustprice->lines) > 0) {
+			foreach ($prodcustprice->lines as $line) {
 				print '<tr class="oddeven">';
 
 				$staticprod = new Product($db);
@@ -621,8 +617,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				print '</td>';
 
 				// Action
-				if ($user->rights->produit->creer || $user->rights->service->creer)
-				{
+				if ($user->rights->produit->creer || $user->rights->service->creer) {
 					print '<td class="right nowraponall">';
 					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&amp;socid='.$object->id.'&amp;prodid='.$line->fk_product.'">';
 					print img_info();
@@ -642,7 +637,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			}
 		} else {
 			$colspan = 10;
-			if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
+			if ($user->rights->produit->supprimer || $user->rights->service->supprimer) {
+				$colspan += 1;
+			}
 			print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
 		}
 
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 54be485d6cd..b3c11ee8bee 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -35,7 +35,9 @@ $langs->loadLangs(array("companies", "projects"));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -48,7 +50,9 @@ $hookmanager->initHooks(array('projectthirdparty'));
 
 $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 
@@ -60,8 +64,7 @@ $contactstatic = new Contact($db);
 
 $form = new Form($db);
 
-if ($socid)
-{
+if ($socid) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
@@ -72,10 +75,14 @@ if ($socid)
 	$result = $object->fetch($socid);
 
 	$title = $langs->trans("Projects");
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+		$title = $object->name." - ".$title;
+	}
 	llxHeader('', $title);
 
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 	$head = societe_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
@@ -89,13 +96,11 @@ if ($socid)
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
-	if ($object->client)
-	{
+	if ($object->client) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		print $object->code_client;
@@ -106,8 +111,7 @@ if ($socid)
 		print '</td></tr>';
 	}
 
-	if ($object->fournisseur)
-	{
+	if ($object->fournisseur) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		print $object->code_fournisseur;
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 3547c5a1e9b..449fd9d7811 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -43,15 +43,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 (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "s.nom";
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "s.nom";
+}
+if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $id, '');
 
 $object = new Societe($db);
@@ -64,51 +72,39 @@ $hookmanager->initHooks(array('contactthirdparty', 'globalcard'));
  * Actions
  */
 
-if ($action == 'addcontact' && $user->rights->societe->creer)
-{
+if ($action == 'addcontact' && $user->rights->societe->creer) {
 	$result = $object->fetch($id);
 
-	if ($result > 0 && $id > 0)
-	{
+	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
 		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
-}
-
-// bascule du statut d'un contact
-elseif ($action == 'swapstatut' && $user->rights->societe->creer)
-{
-	if ($object->fetch($id))
-	{
+} elseif ($action == 'swapstatut' && $user->rights->societe->creer) {
+	// bascule du statut d'un contact
+	if ($object->fetch($id)) {
 		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
-}
-
-// Efface un contact
-elseif ($action == 'deletecontact' && $user->rights->societe->creer)
-{
+} elseif ($action == 'deletecontact' && $user->rights->societe->creer) {
+	// Efface un contact
 	$object->fetch($id);
 	$result = $object->delete_contact($_GET["lineid"]);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -145,10 +141,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) {
 		$soc = new Societe($db);
 		$soc->fetch($object->socid);
 
@@ -169,41 +163,38 @@ if ($id > 0 || !empty($ref))
 
 		// Prospect/Customer
 		/*print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
-    	print $object->getLibCustProspStatut();
-    	print '</td></tr>';
+		print $object->getLibCustProspStatut();
+		print '</td></tr>';
 
-    	// Supplier
-    	print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
-    	print yn($object->fournisseur);
-    	print '</td></tr>';*/
+		// Supplier
+		print '<tr><td>'.$langs->trans('Supplier').'</td><td>';
+		print yn($object->fournisseur);
+		print '</td></tr>';*/
 
-		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-		{
+		if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 			print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
 
-		if ($object->client)
-		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		    print $object->code_client;
-		    $tmpcheck = $object->check_codeclient();
-		    if ($tmpcheck != 0 && $tmpcheck != -5) {
-		    	print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		    }
-		    print '</td></tr>';
+		if ($object->client) {
+			print '<tr><td class="titlefield">';
+			print $langs->trans('CustomerCode').'</td><td colspan="3">';
+			print $object->code_client;
+			$tmpcheck = $object->check_codeclient();
+			if ($tmpcheck != 0 && $tmpcheck != -5) {
+				print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+			}
+			print '</td></tr>';
 		}
 
-		if ($object->fournisseur)
-		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		    print $object->code_fournisseur;
-		    $tmpcheck = $object->check_codefournisseur();
-		    if ($tmpcheck != 0 && $tmpcheck != -5) {
-		    	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		    }
-		    print '</td></tr>';
+		if ($object->fournisseur) {
+			print '<tr><td class="titlefield">';
+			print $langs->trans('SupplierCode').'</td><td colspan="3">';
+			print $object->code_fournisseur;
+			$tmpcheck = $object->check_codefournisseur();
+			if ($tmpcheck != 0 && $tmpcheck != -5) {
+				print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+			}
+			print '</td></tr>';
 		}
 		print '</table>';
 
@@ -214,15 +205,15 @@ 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;
+			}
 		}
 
 		// additionnal list with adherents of company
-		if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire)
-		{
+		if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
@@ -241,12 +232,10 @@ if ($id > 0 || !empty($ref))
 
 			dol_syslog("get list sql=".$sql);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $db->num_rows($resql);
 
-				if ($num > 0)
-				{
+				if ($num > 0) {
 					$param = '';
 
 					$titre = $langs->trans("MembersListOfTiers");
@@ -267,8 +256,7 @@ if ($id > 0 || !empty($ref))
 					print "</tr>\n";
 
 					$i = 0;
-					while ($i < $num && $i < $conf->liste_limit)
-					{
+					while ($i < $num && $i < $conf->liste_limit) {
 						$objp = $db->fetch_object($resql);
 
 						$datefin = $db->jdate($objp->datefin);
@@ -319,8 +307,7 @@ if ($id > 0 || !empty($ref))
 						print "</td>";
 
 						// End of subscription date
-						if ($datefin)
-						{
+						if ($datefin) {
 							print '<td class="center nowrap">';
 							print dol_print_date($datefin, 'day');
 							if ($memberstatic->hasDelay()) {
@@ -329,10 +316,11 @@ if ($id > 0 || !empty($ref))
 							print '</td>';
 						} else {
 							print '<td class="left nowrap">';
-							if ($objp->subscription == 'yes')
-							{
+							if ($objp->subscription == 'yes') {
 								print $langs->trans("SubscriptionNotReceived");
-								if ($objp->statut > 0) print " ".img_warning();
+								if ($objp->statut > 0) {
+									print " ".img_warning();
+								}
 							} else {
 								print '&nbsp;';
 							}
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 1eca5b22623..f67acf2f2d3 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -67,6 +67,8 @@ if ($action == 'editsalesrepresentatives') {
 			print $userstatic->getNomUrl(-1);
 			print ' ';
 		}
-	} else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
+	} else {
+		print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
+	}
 	print '</td></tr>';
 }
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index ff3108d2427..e7a1e086228 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -47,19 +47,27 @@ $search_status = GETPOST('search_status');
 
 // Security check
 $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $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 = 't.login';
-if (!$sortorder) $sortorder = 'ASC';
+if (!$sortfield) {
+	$sortfield = 't.login';
+}
+if (!$sortorder) {
+	$sortorder = 'ASC';
+}
 
 // Initialize technical objects
 $object = new Societe($db);
@@ -78,24 +86,27 @@ unset($objectwebsiteaccount->fields['fk_soc']); // Remove this field, we are alr
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($objectwebsiteaccount->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+foreach ($objectwebsiteaccount->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 ($objectwebsiteaccount->fields as $key => $val)
-{
-	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+foreach ($objectwebsiteaccount->fields as $key => $val) {
+	if ($val['searchall']) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
 }
 
 // Definition of fields for list
 $arrayfields = array();
-foreach ($objectwebsiteaccount->fields as $key => $val)
-{
+foreach ($objectwebsiteaccount->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']);
+	if (!empty($val['visible'])) {
+		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled']);
+	}
 }
 
 // Extra fields
@@ -105,8 +116,7 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 
-if ($id > 0)
-{
+if ($id > 0) {
 	$result = $object->fetch($id);
 }
 
@@ -117,13 +127,13 @@ if ($id > 0)
 
 $parameters = array('id'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	// Cancel
-	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-	{
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	}
@@ -132,18 +142,15 @@ 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
-	{
-		foreach ($objectwebsiteaccount->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 ($objectwebsiteaccount->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
 	}
 
@@ -172,14 +179,21 @@ $title = $langs->trans("WebsiteAccounts");
 llxHeader('', $title);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($id > 0) $param .= '&id='.urlencode($id);
-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 ($id > 0) {
+	$param .= '&id='.urlencode($id);
+}
+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';
 
@@ -198,8 +212,7 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border centpercent">';
 
 // Prefix
-if (!empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
-{
+if (!empty($conf->global->SOCIETE_USEPREFIX)) { // Old not used prefix field
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
@@ -247,29 +260,39 @@ print '<br>';
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($objectwebsiteaccount->fields as $key => $val)
-{
+foreach ($objectwebsiteaccount->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();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $objectwebsiteaccount); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/, $/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX."societe_account 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 ($objectwebsiteaccount->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity('societeaccount').")";
-else $sql .= " WHERE 1 = 1";
-$sql .= " AND fk_soc = ".$object->id;
-foreach ($search as $key => $val)
-{
-	$mode_search = (($objectwebsiteaccount->isInt($objectwebsiteaccount->fields[$key]) || $objectwebsiteaccount->isFloat($objectwebsiteaccount->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 ($objectwebsiteaccount->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity('societeaccount').")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
+$sql .= " AND fk_soc = ".$object->id;
+foreach ($search as $key => $val) {
+	$mode_search = (($objectwebsiteaccount->isInt($objectwebsiteaccount->fields[$key]) || $objectwebsiteaccount->isFloat($objectwebsiteaccount->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
@@ -296,12 +319,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;
 	}
@@ -310,8 +331,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -325,12 +345,18 @@ $arrayofmassactions = array(
 //'presend'=>$langs->trans("SendByMail"),
 //'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->mymodule->delete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->mymodule->delete) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 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">';
@@ -361,11 +387,13 @@ $moreforfilter.= '</div>';*/
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $objectwebsiteaccount); // Note that $action and $objectwebsiteaccount 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>';
@@ -382,13 +410,20 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($objectwebsiteaccount->fields as $key => $val)
-{
+foreach ($objectwebsiteaccount->fields as $key => $val) {
 	$align = '';
-	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
-	if (in_array($val['type'], array('timestamp'))) $align .= ' nowrap';
-	if ($key == 'status') $align .= ($align ? ' ' : '').'center';
-	if (!empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align ? ' '.$align : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$align = 'center';
+	}
+	if (in_array($val['type'], array('timestamp'))) {
+		$align .= ' nowrap';
+	}
+	if ($key == 'status') {
+		$align .= ($align ? ' ' : '').'center';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print '<td class="liste_titre'.($align ? ' '.$align : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -407,13 +442,20 @@ print '</tr>'."\n";
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($objectwebsiteaccount->fields as $key => $val)
-{
+foreach ($objectwebsiteaccount->fields as $key => $val) {
 	$align = '';
-	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
-	if (in_array($val['type'], array('timestamp'))) $align .= 'nowrap';
-	if ($key == 'status') $align .= ($align ? ' ' : '').'center';
-	if (!empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$align = 'center';
+	}
+	if (in_array($val['type'], array('timestamp'))) {
+		$align .= 'nowrap';
+	}
+	if ($key == 'status') {
+		$align .= ($align ? ' ' : '').'center';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
+	}
 }
 // Extra fields
 // Extra fields
@@ -428,11 +470,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
+		}
 	}
 }
 
@@ -440,40 +482,54 @@ 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
 	$objectwebsiteaccount->id = $obj->rowid;
 	$objectwebsiteaccount->login = $obj->login;
 	$objectwebsiteaccount->ref = $obj->login;
-	foreach ($objectwebsiteaccount->fields as $key => $val)
-	{
-		if (property_exists($obj, $key)) $object->$key = $obj->$key;
+	foreach ($objectwebsiteaccount->fields as $key => $val) {
+		if (property_exists($obj, $key)) {
+			$object->$key = $obj->$key;
+		}
 	}
 
 	// Show here line of result
 	print '<tr class="oddeven">';
-	foreach ($objectwebsiteaccount->fields as $key => $val)
-	{
+	foreach ($objectwebsiteaccount->fields as $key => $val) {
 		$align = '';
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align = 'center';
-		if (in_array($val['type'], array('timestamp'))) $align .= 'nowrap';
-		if ($key == 'status') $align .= ($align ? ' ' : '').'center';
-		if (!empty($arrayfields['t.'.$key]['checked']))
-		{
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$align = 'center';
+		}
+		if (in_array($val['type'], array('timestamp'))) {
+			$align .= 'nowrap';
+		}
+		if ($key == 'status') {
+			$align .= ($align ? ' ' : '').'center';
+		}
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td';
-			if ($align) print ' class="'.$align.'"';
+			if ($align) {
+				print ' class="'.$align.'"';
+			}
 			print '>';
-			if ($key == 'login') print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
-			else print $objectwebsiteaccount->showOutputField($val, $key, $obj->$key, '');
+			if ($key == 'login') {
+				print $objectwebsiteaccount->getNomUrl(1, '', 0, '', 1);
+			} else {
+				print $objectwebsiteaccount->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;
 			}
 		}
@@ -486,14 +542,17 @@ while ($i < min($num, $limit))
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
-		if (in_array($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>';
 
@@ -505,10 +564,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>';
 }
 
@@ -524,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/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 6a52b57268b..edac0a79833 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -37,7 +37,9 @@ $servicename = 'Stripe';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'paypal', 'paybox', 'stripe'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $action = GETPOST('action', 'aZ09');
 
@@ -46,64 +48,79 @@ $action = GETPOST('action', 'aZ09');
  * Actions
  */
 
-if ($action == 'setvalue' && $user->admin)
-{
+if ($action == 'setvalue' && $user->admin) {
 	$db->begin();
 
 	if (empty($conf->stripeconnect->enabled)) {
 		$result = dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY", GETPOST('STRIPE_TEST_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0)
+		if (!$result > 0) {
 			$error++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY", GETPOST('STRIPE_TEST_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0)
+		if (!$result > 0) {
 			$error++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_ID", GETPOST('STRIPE_TEST_WEBHOOK_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0)
+		if (!$result > 0) {
 			$error++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_KEY", GETPOST('STRIPE_TEST_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0)
+		if (!$result > 0) {
 			$error++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY", GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0)
+		if (!$result > 0) {
 			$error++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY", GETPOST('STRIPE_LIVE_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0)
+		if (!$result > 0) {
 			$error++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_ID", GETPOST('STRIPE_LIVE_WEBHOOK_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0)
+		if (!$result > 0) {
 			$error++;
+		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_KEY", GETPOST('STRIPE_LIVE_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0)
+		if (!$result > 0) {
 			$error++;
+		}
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0)
+	if (!$result > 0) {
 		$error++;
+	}
 	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0)
+	if (!$result > 0) {
 		$error++;
+	}
 	$result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
 	if (!$result > 0) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0)
+	if (!$result > 0) {
 		$error++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0)
+	if (!$result > 0) {
 		$error++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0)
+	if (!$result > 0) {
 		$error++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0)
+	if (!$result > 0) {
 		$error++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0)
+	if (!$result > 0) {
 		$error++;
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0)
+	if (!$result > 0) {
 		$error++;
+	}
 	// Stock decrement
 	//$result = dolibarr_set_const($db, "ONLINE_PAYMENT_WAREHOUSE", (GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') > 0 ? GETPOST('ONLINE_PAYMENT_WAREHOUSE', 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	//if (! $result > 0)
@@ -130,8 +147,7 @@ if ($action == 'setvalue' && $user->admin)
 	}
 }
 
-if ($action == "setlive")
-{
+if ($action == "setlive") {
 	$liveenable = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable, 'yesno', 0, '', $conf->entity);
 	if ($res > 0) {
@@ -188,8 +204,7 @@ if ($conf->use_javascript_ajax) {
 }
 print '</td><td></td></tr>';
 
-if (empty($conf->stripeconnect->enabled))
-{
+if (empty($conf->stripeconnect->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
 	print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
@@ -216,10 +231,8 @@ if (empty($conf->stripeconnect->enabled))
 	$out .= ajax_autoselect("onlinetestwebhookurl", 0);
 	print '<br>'.$out;
 	print '</td><td>';
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-	{
-		if (!empty($conf->global->STRIPE_TEST_WEBHOOK_KEY) && !empty($conf->global->STRIPE_TEST_SECRET_KEY) && !empty($conf->global->STRIPE_TEST_WEBHOOK_ID))
-		{
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		if (!empty($conf->global->STRIPE_TEST_WEBHOOK_KEY) && !empty($conf->global->STRIPE_TEST_SECRET_KEY) && !empty($conf->global->STRIPE_TEST_WEBHOOK_ID)) {
 			\Stripe\Stripe::setApiKey($conf->global->STRIPE_TEST_SECRET_KEY);
 			$endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_TEST_WEBHOOK_ID);
 			$endpoint->enabled_events = $stripearrayofwebhookevents;
@@ -232,8 +245,7 @@ if (empty($conf->stripeconnect->enabled))
 			}
 			$endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 3);
 			$endpoint->save();
-			if ($endpoint->status == 'enabled')
-			{
+			if ($endpoint->status == 'enabled') {
 				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
 				print img_picto($langs->trans("Activated"), 'switch_on');
 			} else {
@@ -257,8 +269,7 @@ if (empty($conf->stripeconnect->enabled))
 	print '</td><td></td></tr>';
 }
 
-if (empty($conf->stripeconnect->enabled))
-{
+if (empty($conf->stripeconnect->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
 	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
@@ -285,10 +296,8 @@ if (empty($conf->stripeconnect->enabled))
 	$out .= ajax_autoselect("onlinelivewebhookurl", 0);
 	print '<br>'.$out;
 	print '</td><td>';
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-	{
-		if (!empty($conf->global->STRIPE_LIVE_WEBHOOK_KEY) && !empty($conf->global->STRIPE_LIVE_SECRET_KEY) && !empty($conf->global->STRIPE_LIVE_WEBHOOK_ID))
-		{
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		if (!empty($conf->global->STRIPE_LIVE_WEBHOOK_KEY) && !empty($conf->global->STRIPE_LIVE_SECRET_KEY) && !empty($conf->global->STRIPE_LIVE_WEBHOOK_ID)) {
 			\Stripe\Stripe::setApiKey($conf->global->STRIPE_LIVE_SECRET_KEY);
 			$endpoint = \Stripe\WebhookEndpoint::retrieve($conf->global->STRIPE_LIVE_WEBHOOK_ID);
 			$endpoint->enabled_events = $stripearrayofwebhookevents;
@@ -301,8 +310,7 @@ if (empty($conf->stripeconnect->enabled))
 			}
 			$endpoint->url = dol_buildpath('/public/stripe/ipn.php', 3);
 			$endpoint->save();
-			if ($endpoint->status == 'enabled')
-			{
+			if ($endpoint->status == 'enabled') {
 				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
 				print img_picto($langs->trans("Activated"), 'switch_on');
 			} else {
@@ -351,8 +359,7 @@ print img_picto('', 'bank_account').' ';
 $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 print '</td></tr>';
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
-{
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// What is this for ?
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccountForBankTransfer").'</td><td>';
 	$form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
@@ -360,8 +367,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// What is this for ?
 }
 
 // Activate Payment Request API
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
-{
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_PAYMENT_REQUEST_API").'</td><td>';
 	if ($conf->use_javascript_ajax) {
@@ -374,8 +380,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 }
 
 // Activate SEPA DIRECT_DEBIT
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
-{
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_SEPA_DIRECT_DEBIT").'</td><td>';
 	if ($conf->use_javascript_ajax) {
@@ -388,8 +393,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 }
 
 // Activate Bancontact
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
-{
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_BANCONTACT").'</td><td>';
 	if ($conf->use_javascript_ajax) {
@@ -403,8 +407,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 }
 
 // Activate iDEAL
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
-{
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_IDEAL").'</td><td>';
 	if ($conf->use_javascript_ajax) {
@@ -418,8 +421,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 }
 
 // Activate Giropay
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
-{
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_GIROPAY").'</td><td>';
 	if ($conf->use_javascript_ajax) {
@@ -433,8 +435,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 }
 
 // Activate Sofort
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
-{
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("STRIPE_SOFORT").'</td><td>';
 	if ($conf->use_javascript_ajax) {
@@ -540,8 +541,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 
 print info_admin($langs->trans("ExampleOfTestCreditCard", '4242424242424242 (no 3DSecure) or 4000000000003063 (3DSecure required) or 4000002760003184 (3DSecure2 required on all transaction) or 4000003800000446 (3DSecure2 required, the off-session allowed)', '4000000000000101', '4000000000000069', '4000000000000341'));
 
-if (!empty($conf->use_javascript_ajax))
-{
+if (!empty($conf->use_javascript_ajax)) {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {
 	            $("#apidoc").hide();
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index beadfee1a89..a3598f1d29f 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -26,14 +26,18 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -41,7 +45,9 @@ $rowid = GETPOST("rowid", 'alpha');
 $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;
@@ -60,8 +66,7 @@ $stripe = new Stripe($db);
 
 llxHeader('', $langs->trans("StripeChargeList"));
 
-if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')))
-{
+if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
@@ -80,11 +85,12 @@ if (!$rowid) {
 	$option = array('limit' => $limit + 1);
 	$num = 0;
 
-	if (GETPOSTISSET('starting_after_'.$page)) $option['starting_after'] = GETPOST('starting_after_'.$page, 'alphanohtml');
+	if (GETPOSTISSET('starting_after_'.$page)) {
+		$option['starting_after'] = GETPOST('starting_after_'.$page, 'alphanohtml');
+	}
 
 	try {
-		if ($stripeacc)
-		{
+		if ($stripeacc) {
 			$list = \Stripe\Charge::all($option, array("stripe_account" => $stripeacc));
 		} else {
 			$list = \Stripe\Charge::all($option);
@@ -96,7 +102,9 @@ if (!$rowid) {
 
 		$param = '';
 		//if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
 		$param .= '&starting_after_'.($page + 1).'='.$list->data[($limit - 1)]->id;
 		//$param.='&ending_before_'.($page+1).'='.$list->data[($limit-1)]->id;
 
@@ -106,7 +114,9 @@ if (!$rowid) {
 	}
 
 	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">';
@@ -135,8 +145,7 @@ if (!$rowid) {
 
 	//print $list;
 	$i = 0;
-	foreach ($list->data as $charge)
-	{
+	foreach ($list->data as $charge) {
 		if ($i >= $limit) {
 			break;
 		}
@@ -179,17 +188,14 @@ if (!$rowid) {
 		// Save into $tmparray all metadata
 		$tmparray = dolExplodeIntoArray($FULLTAG, '.', '=');
 		// Load origin object according to metadata
-		if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0)
-		{
+		if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0) {
 			$societestatic->fetch($tmparray['CUS']);
-		} elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
-		{
+		} elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0) {
 			$societestatic->fetch($charge->metadata->dol_thirdparty_id);
 		} else {
 			$societestatic->id = 0;
 		}
-		if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
-		{
+		if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0) {
 			$memberstatic->fetch($tmparray['MEM']);
 		} else {
 			$memberstatic->id = 0;
@@ -197,40 +203,41 @@ if (!$rowid) {
 
 		print '<tr class="oddeven">';
 
-		if (!empty($stripeacc)) $connect = $stripeacc.'/';
+		if (!empty($stripeacc)) {
+			$connect = $stripeacc.'/';
+		}
 
 		// Ref
 		$url = 'https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
-		if ($servicestatus)
-		{
+		if ($servicestatus) {
 			$url = 'https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
 		}
 		print "<td>";
 		print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$charge->id."</a>";
-		if ($charge->payment_intent) print '<br><span class="opacitymedium">'.$charge->payment_intent.'</span>';
+		if ($charge->payment_intent) {
+			print '<br><span class="opacitymedium">'.$charge->payment_intent.'</span>';
+		}
 		print "</td>\n";
 
 		// Stripe customer
 		print "<td>";
-		if (!empty($conf->stripe->enabled) && !empty($stripeacc)) $connect = $stripeacc.'/';
+		if (!empty($conf->stripe->enabled) && !empty($stripeacc)) {
+			$connect = $stripeacc.'/';
+		}
 		$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$charge->customer;
-		if ($servicestatus)
-		{
+		if ($servicestatus) {
 			$url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
 		}
-		if (!empty($charge->customer))
-		{
+		if (!empty($charge->customer)) {
 			print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'globe').' '.$charge->customer.'</a>';
 		}
 		print "</td>\n";
 
 		// Link
 		print "<td>";
-		if ($societestatic->id > 0)
-		{
+		if ($societestatic->id > 0) {
 			print $societestatic->getNomUrl(1);
-		} elseif ($memberstatic->id > 0)
-		{
+		} elseif ($memberstatic->id > 0) {
 			print $memberstatic->getNomUrl(1);
 		}
 		print "</td>\n";
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index 159444bb029..e44f3480042 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -71,25 +71,21 @@ class ActionsStripeconnect
 	{
 		global $db, $conf, $user, $langs, $form;
 
-		if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')))
-		{
+		if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
 			$service = 'StripeTest';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 		} else {
 			$service = 'StripeLive';
 		}
 
-		if (is_array($parameters) && !empty($parameters))
-		{
-			foreach ($parameters as $key=>$value)
-			{
+		if (is_array($parameters) && !empty($parameters)) {
+			foreach ($parameters as $key => $value) {
 				$key = $value;
 			}
 		}
 
 
-		if (is_object($object) && $object->element == 'societe')
-		{
+		if (is_object($object) && $object->element == 'societe') {
 			$this->resprints .= '<tr><td>';
 			$this->resprints .= '<table width="100%" class="nobordernopadding"><tr><td>';
 			$this->resprints .= $langs->trans('StripeCustomer');
@@ -195,20 +191,16 @@ class ActionsStripeconnect
 
 			$resteapayer = $object->total_ttc - $totalpaye;
 			// Request a direct debit order
-			if ($object->statut > Facture::STATUS_DRAFT && $object->statut < Facture::STATUS_ABANDONED && $object->paye == 0)
-			{
+			if ($object->statut > Facture::STATUS_DRAFT && $object->statut < Facture::STATUS_ABANDONED && $object->paye == 0) {
 				$stripe = new Stripe($this->db);
-				if ($resteapayer > 0)
-				{
-					if ($stripe->getStripeAccount($conf->entity))  // a modifier avec droit stripe
-					{
+				if ($resteapayer > 0) {
+					if ($stripe->getStripeAccount($conf->entity)) {  // a modifier avec droit stripe
 						$langs->load("withdrawals");
 						print '<a class="butActionDelete" href="'.dol_buildpath('/stripeconnect/payment.php?facid='.$object->id.'&action=create', 1).'" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
 					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 					}
-				} elseif ($resteapayer == 0)
-				{
+				} elseif ($resteapayer == 0) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 				}
 			} else {
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 259e1cea935..9caf72c20e1 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -91,7 +91,9 @@ class Stripe extends CommonObject
 		global $conf;
 
 		$key = '';
-		if ($entity < 0) $entity = $conf->entity;
+		if ($entity < 0) {
+			$entity = $conf->entity;
+		}
 
 		$sql = "SELECT tokenstring";
 		$sql .= " FROM ".MAIN_DB_PREFIX."oauth_token";
@@ -155,8 +157,7 @@ class Stripe extends CommonObject
 	{
 		global $conf, $user;
 
-		if (empty($object->id))
-		{
+		if (empty($object->id)) {
 			dol_syslog("customerStripe is called with the parameter object that is not loaded");
 			return null;
 		}
@@ -193,8 +194,7 @@ class Stripe extends CommonObject
 						//$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
 						$customer = \Stripe\Customer::retrieve(array('id'=>"$tiers", 'expand[]'=>'sources'), array("stripe_account" => $key));
 					}
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					// For exemple, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
 					$this->error = $e->getMessage();
 				}
@@ -234,13 +234,10 @@ class Stripe extends CommonObject
 					}
 
 					// Create the VAT record in Stripe
-					if (!empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
-					{
-						if (!empty($vatcleaned))
-						{
+					if (!empty($conf->global->STRIPE_SAVE_TAX_IDS)) {	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+						if (!empty($vatcleaned)) {
 							$isineec = isInEEC($object);
-							if ($object->country_code && $isineec)
-							{
+							if ($object->country_code && $isineec) {
 								//$taxids = $customer->allTaxIds($customer->id);
 								$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
 							}
@@ -251,12 +248,10 @@ class Stripe extends CommonObject
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_account (fk_soc, login, key_account, site, site_account, status, entity, date_creation, fk_user_creat)";
 					$sql .= " VALUES (".$object->id.", '', '".$this->db->escape($customer->id)."', 'stripe', '".$this->db->escape($stripearrayofkeysbyenv[$status]['publishable_key'])."', ".$status.", ".$conf->entity.", '".$this->db->idate(dol_now())."', ".$user->id.")";
 					$resql = $this->db->query($sql);
-					if (!$resql)
-					{
+					if (!$resql) {
 						$this->error = $this->db->lasterror();
 					}
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 				}
 			}
@@ -288,8 +283,7 @@ class Stripe extends CommonObject
 			} else {
 				$stripepaymentmethod = \Stripe\PaymentMethod::retrieve(''.$paymentmethod->id.'', array("stripe_account" => $key));
 			}
-		} catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			$this->error = $e->getMessage();
 		}
 
@@ -329,12 +323,18 @@ class Stripe extends CommonObject
 
 		$error = 0;
 
-		if (empty($status)) $service = 'StripeTest';
-		else $service = 'StripeLive';
+		if (empty($status)) {
+			$service = 'StripeTest';
+		} else {
+			$service = 'StripeLive';
+		}
 
 		$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-		if (!in_array($currency_code, $arrayzerounitcurrency)) $stripeamount = $amount * 100;
-		else $stripeamount = $amount;
+		if (!in_array($currency_code, $arrayzerounitcurrency)) {
+			$stripeamount = $amount * 100;
+		} else {
+			$stripeamount = $amount;
+		}
 
 		$fee = $amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE;
 		if ($fee >= $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL && $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL > $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
@@ -350,8 +350,7 @@ class Stripe extends CommonObject
 
 		$paymentintent = null;
 
-		if (is_object($object) && !empty($conf->global->STRIPE_REUSE_EXISTING_INTENT_IF_FOUND))
-		{
+		if (is_object($object) && !empty($conf->global->STRIPE_REUSE_EXISTING_INTENT_IF_FOUND)) {
 			// Warning. If a payment was tried and failed, a payment intent was created.
 			// But if we change something on object to pay (amount or other that does not change the idempotency key), reusing same payment intent is not allowed by Stripe.
 			// Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed by Stripe after a delay), Stripe will
@@ -369,8 +368,7 @@ class Stripe extends CommonObject
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$num = $this->db->num_rows($resql);
-				if ($num)
-				{
+				if ($num) {
 					$obj = $this->db->fetch_object($resql);
 					$intent = $obj->ext_payment_id;
 
@@ -386,8 +384,7 @@ class Stripe extends CommonObject
 						} else {
 							$paymentintent = \Stripe\PaymentIntent::retrieve($intent, array("stripe_account" => $key));
 						}
-					}
-					catch (Exception $e) {
+					} catch (Exception $e) {
 						$error++;
 						$this->error = $e->getMessage();
 					}
@@ -395,25 +392,35 @@ class Stripe extends CommonObject
 			}
 		}
 
-		if (empty($paymentintent))
-		{
+		if (empty($paymentintent)) {
 			// Try to create intent. See https://stripe.com/docs/api/payment_intents/create
 			$ipaddress = getUserRemoteIP();
 			$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
-			if (is_object($object))
-			{
+			if (is_object($object)) {
 				$metadata['dol_type'] = $object->element;
 				$metadata['dol_id'] = $object->id;
-				if (is_object($object->thirdparty) && $object->thirdparty->id > 0) $metadata['dol_thirdparty_id'] = $object->thirdparty->id;
+				if (is_object($object->thirdparty) && $object->thirdparty->id > 0) {
+					$metadata['dol_thirdparty_id'] = $object->thirdparty->id;
+				}
 			}
 
 			// list of payment method types
 			$paymentmethodtypes = array("card");
-			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) $paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
-			if (!empty($conf->global->STRIPE_BANCONTACT)) $paymentmethodtypes[] = "bancontact";
-			if (!empty($conf->global->STRIPE_IDEAL)) $paymentmethodtypes[] = "ideal";
-			if (!empty($conf->global->STRIPE_GIROPAY)) $paymentmethodtypes[] = "giropay";
-			if (!empty($conf->global->STRIPE_SOFORT)) $paymentmethodtypes[] = "sofort";
+			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+				$paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
+			}
+			if (!empty($conf->global->STRIPE_BANCONTACT)) {
+				$paymentmethodtypes[] = "bancontact";
+			}
+			if (!empty($conf->global->STRIPE_IDEAL)) {
+				$paymentmethodtypes[] = "ideal";
+			}
+			if (!empty($conf->global->STRIPE_GIROPAY)) {
+				$paymentmethodtypes[] = "giropay";
+			}
+			if (!empty($conf->global->STRIPE_SOFORT)) {
+				$paymentmethodtypes[] = "sofort";
+			}
 
 			$dataforintent = array(
 				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
@@ -427,32 +434,32 @@ class Stripe extends CommonObject
 				"setup_future_usage" => "on_session",
 				"metadata" => $metadata
 			);
-			if (!is_null($customer)) $dataforintent["customer"] = $customer;
+			if (!is_null($customer)) {
+				$dataforintent["customer"] = $customer;
+			}
 			// payment_method =
 			// payment_method_types = array('card')
 			//var_dump($dataforintent);
-			if ($off_session)
-			{
+			if ($off_session) {
 				unset($dataforintent['setup_future_usage']);
 				// We can't use both "setup_future_usage" = "off_session" and "off_session" = true.
 				// Because $off_session parameter is dedicated to create paymentintent off_line (and not future payment), we need to use "off_session" = true.
 				//$dataforintent["setup_future_usage"] = "off_session";
 				$dataforintent["off_session"] = true;
 			}
-			if (!empty($conf->global->STRIPE_GIROPAY)) unset($dataforintent['setup_future_usage']);
+			if (!empty($conf->global->STRIPE_GIROPAY)) {
+				unset($dataforintent['setup_future_usage']);
+			}
 
-			if (!is_null($payment_method))
-			{
+			if (!is_null($payment_method)) {
 				$dataforintent["payment_method"] = $payment_method;
 				$description .= ' - '.$payment_method;
 			}
 
-			if ($conf->entity != $conf->global->STRIPECONNECT_PRINCIPAL && $stripefee > 0)
-			{
+			if ($conf->entity != $conf->global->STRIPECONNECT_PRINCIPAL && $stripefee > 0) {
 				$dataforintent["application_fee_amount"] = $stripefee;
 			}
-			if ($usethirdpartyemailforreceiptemail && is_object($object) && $object->thirdparty->email)
-			{
+			if ($usethirdpartyemailforreceiptemail && is_object($object) && $object->thirdparty->email) {
 				$dataforintent["receipt_email"] = $object->thirdparty->email;
 			}
 
@@ -475,8 +482,7 @@ class Stripe extends CommonObject
 				$paymentintent = \Stripe\PaymentIntent::create($dataforintent, $arrayofoptions);
 
 				// Store the payment intent
-				if (is_object($object))
-				{
+				if (is_object($object)) {
 					$paymentintentalreadyexists = 0;
 					// Check that payment intent $paymentintent->id is not already recorded.
 					$sql = "SELECT pi.rowid";
@@ -489,22 +495,23 @@ class Stripe extends CommonObject
 					$resql = $this->db->query($sql);
 					if ($resql) {
 						$num = $this->db->num_rows($resql);
-						if ($num)
-						{
+						if ($num) {
 							$obj = $this->db->fetch_object($resql);
-							if ($obj) $paymentintentalreadyexists++;
+							if ($obj) {
+								$paymentintentalreadyexists++;
+							}
 						}
-					} else dol_print_error($this->db);
+					} else {
+						dol_print_error($this->db);
+					}
 
 					// If not, we create it.
-					if (!$paymentintentalreadyexists)
-					{
+					if (!$paymentintentalreadyexists) {
 						$now = dol_now();
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_facture_demande (date_demande, fk_user_demande, ext_payment_id, fk_facture, sourcetype, entity, ext_payment_site, amount)";
 						$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", '".$this->db->escape($paymentintent->id)."', ".$object->id.", '".$this->db->escape($object->element)."', ".$conf->entity.", '".$this->db->escape($service)."', ".$amount.")";
 						$resql = $this->db->query($sql);
-						if (!$resql)
-						{
+						if (!$resql) {
 							$error++;
 							$this->error = $this->db->lasterror();
 							dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.");
@@ -513,20 +520,18 @@ class Stripe extends CommonObject
 				} else {
 					$_SESSION["stripe_payment_intent"] = $paymentintent;
 				}
-			} catch (Stripe\Error\Card $e)
-			{
+			} catch (Stripe\Error\Card $e) {
 				$error++;
 				$this->error = $e->getMessage();
 				$this->code = $e->getStripeCode();
 				$this->declinecode = $e->getDeclineCode();
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				/*var_dump($dataforintent);
-    		    var_dump($description);
-    		    var_dump($key);
-    		    var_dump($paymentintent);
-    		    var_dump($e->getMessage());
-    		    var_dump($e);*/
+				var_dump($description);
+				var_dump($key);
+				var_dump($paymentintent);
+				var_dump($e->getMessage());
+				var_dump($e);*/
 				$error++;
 				$this->error = $e->getMessage();
 				$this->code = '';
@@ -570,29 +575,40 @@ class Stripe extends CommonObject
 
 		$error = 0;
 
-		if (empty($status)) $service = 'StripeTest';
-		else $service = 'StripeLive';
+		if (empty($status)) {
+			$service = 'StripeTest';
+		} else {
+			$service = 'StripeLive';
+		}
 
 		$setupintent = null;
 
-		if (empty($setupintent))
-		{
+		if (empty($setupintent)) {
 			$ipaddress = getUserRemoteIP();
 			$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
-			if (is_object($object))
-			{
+			if (is_object($object)) {
 				$metadata['dol_type'] = $object->element;
 				$metadata['dol_id'] = $object->id;
-				if (is_object($object->thirdparty) && $object->thirdparty->id > 0) $metadata['dol_thirdparty_id'] = $object->thirdparty->id;
+				if (is_object($object->thirdparty) && $object->thirdparty->id > 0) {
+					$metadata['dol_thirdparty_id'] = $object->thirdparty->id;
+				}
 			}
 
 			// list of payment method types
 			$paymentmethodtypes = array("card");
-			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) $paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
-			if (!empty($conf->global->STRIPE_BANCONTACT)) $paymentmethodtypes[] = "bancontact";
-			if (!empty($conf->global->STRIPE_IDEAL)) $paymentmethodtypes[] = "ideal";
+			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+				$paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
+			}
+			if (!empty($conf->global->STRIPE_BANCONTACT)) {
+				$paymentmethodtypes[] = "bancontact";
+			}
+			if (!empty($conf->global->STRIPE_IDEAL)) {
+				$paymentmethodtypes[] = "ideal";
+			}
 			// Giropay not possible for setup intent
-			if (!empty($conf->global->STRIPE_SOFORT)) $paymentmethodtypes[] = "sofort";
+			if (!empty($conf->global->STRIPE_SOFORT)) {
+				$paymentmethodtypes[] = "sofort";
+			}
 
 			$dataforintent = array(
 				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
@@ -600,14 +616,17 @@ class Stripe extends CommonObject
 				"usage" => "off_session",
 				"metadata" => $metadata
 			);
-			if (!is_null($customer)) $dataforintent["customer"] = $customer;
-			if (!is_null($description)) $dataforintent["description"] = $description;
+			if (!is_null($customer)) {
+				$dataforintent["customer"] = $customer;
+			}
+			if (!is_null($description)) {
+				$dataforintent["description"] = $description;
+			}
 			// payment_method =
 			// payment_method_types = array('card')
 			//var_dump($dataforintent);
 
-			if ($usethirdpartyemailforreceiptemail && is_object($object) && $object->thirdparty->email)
-			{
+			if ($usethirdpartyemailforreceiptemail && is_object($object) && $object->thirdparty->email) {
 				$dataforintent["receipt_email"] = $object->thirdparty->email;
 			}
 
@@ -670,8 +689,7 @@ class Stripe extends CommonObject
 				{
 					$_SESSION["stripe_setup_intent"] = $setupintent;
 				}*/
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				/*var_dump($dataforintent);
 				 var_dump($description);
 				 var_dump($key);
@@ -682,8 +700,7 @@ class Stripe extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			dol_syslog("getSetupIntent ".(is_object($setupintent) ? $setupintent->id : ''), LOG_INFO, -1);
 			return $setupintent;
 		} else {
@@ -718,24 +735,20 @@ class Stripe extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$obj = $this->db->fetch_object($resql);
 				$cardref = $obj->stripe_card_ref;
 				dol_syslog(get_class($this)."::cardStripe cardref=".$cardref);
-				if ($cardref)
-				{
+				if ($cardref) {
 					try {
 						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources))
-							{
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
 								$card = $cu->sources->retrieve($cardref);
 							} else {
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						} else {
-							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources))
-							{
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
 								//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
 								$card = $cu->sources->retrieve($cardref);
 							} else {
@@ -743,13 +756,11 @@ class Stripe extends CommonObject
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						}
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
-				} elseif ($createifnotlinkedtostripe)
-				{
+				} elseif ($createifnotlinkedtostripe) {
 					$exp_date_month = $obj->exp_date_month;
 					$exp_date_year = $obj->exp_date_year;
 					$number = $obj->number;
@@ -767,20 +778,19 @@ class Stripe extends CommonObject
 					//var_dump($a);var_dump($stripeacc);exit;
 					try {
 						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-							{
+							if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
 								dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
 								$card = $cu->sources->create($dataforcard);
-								if (!$card)
-								{
+								if (!$card) {
 									$this->error = 'Creation of card on Stripe has failed';
 								}
 							} else {
 								$connect = '';
-								if (!empty($stripeacc)) $connect = $stripeacc.'/';
+								if (!empty($stripeacc)) {
+									$connect = $stripeacc.'/';
+								}
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
-								if ($status)
-								{
+								if ($status) {
 									$url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$cu->id;
 								}
 								$urtoswitchonstripe = ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'globe').'</a>';
@@ -789,20 +799,19 @@ class Stripe extends CommonObject
 								$this->error = $langs->trans('CreationOfPaymentModeMustBeDoneFromStripeInterface', $urtoswitchonstripe);
 							}
 						} else {
-							if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
-							{
+							if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
 								dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
 								$card = $cu->sources->create($dataforcard, array("stripe_account" => $stripeacc));
-								if (!$card)
-								{
+								if (!$card) {
 									$this->error = 'Creation of card on Stripe has failed';
 								}
 							} else {
 								$connect = '';
-								if (!empty($stripeacc)) $connect = $stripeacc.'/';
+								if (!empty($stripeacc)) {
+									$connect = $stripeacc.'/';
+								}
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
-								if ($status)
-								{
+								if ($status) {
 									$url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$cu->id;
 								}
 								$urtoswitchonstripe = ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'globe').'</a>';
@@ -812,8 +821,7 @@ class Stripe extends CommonObject
 							}
 						}
 
-						if ($card)
-						{
+						if ($card) {
 							$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
 							$sql .= " SET stripe_card_ref = '".$this->db->escape($card->id)."', card_type = '".$this->db->escape($card->brand)."',";
 							$sql .= " country_code = '".$this->db->escape($card->country)."',";
@@ -821,13 +829,11 @@ class Stripe extends CommonObject
 							$sql .= " WHERE rowid = ".$object->id;
 							$sql .= " AND type = 'card'";
 							$resql = $this->db->query($sql);
-							if (!$resql)
-							{
+							if (!$resql) {
 								$this->error = $this->db->lasterror();
 							}
 						}
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
@@ -862,8 +868,11 @@ class Stripe extends CommonObject
 
 		$error = 0;
 
-		if (empty($status)) $service = 'StripeTest';
-		else $service = 'StripeLive';
+		if (empty($status)) {
+			$service = 'StripeTest';
+		} else {
+			$service = 'StripeLive';
+		}
 
 		$sql = "SELECT sa.key_account as key_account, sa.fk_soc, sa.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as sa";
@@ -885,11 +894,16 @@ class Stripe extends CommonObject
 		}
 
 		$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-		if (!in_array($currency, $arrayzerounitcurrency)) $stripeamount = $amount * 100;
-		else $stripeamount = $amount;
+		if (!in_array($currency, $arrayzerounitcurrency)) {
+			$stripeamount = $amount * 100;
+		} else {
+			$stripeamount = $amount;
+		}
 
 		$societe = new Societe($this->db);
-		if ($key > 0) $societe->fetch($key);
+		if ($key > 0) {
+			$societe->fetch($key);
+		}
 
 		$description = "";
 		$ref = "";
@@ -922,10 +936,8 @@ class Stripe extends CommonObject
 			global $stripearrayofkeysbyenv;
 			\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
 
-			if (empty($conf->stripeconnect->enabled))	// With a common Stripe account
-			{
-				if (preg_match('/pm_/i', $source))
-				{
+			if (empty($conf->stripeconnect->enabled)) {	// With a common Stripe account
+				if (preg_match('/pm_/i', $source)) {
 					$stripecard = $source;
 					$amountstripe = $stripeamount;
 					$FULLTAG = 'PFBO'; // Payment From Back Office
@@ -942,8 +954,7 @@ class Stripe extends CommonObject
 					$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $invoice, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
 
 					$charge = new stdClass();
-					if ($paymentintent->status == 'succeeded')
-					{
+					if ($paymentintent->status == 'succeeded') {
 						$charge->status = 'ok';
 					} else {
 						$charge->status = 'failed';
@@ -954,8 +965,7 @@ class Stripe extends CommonObject
 						$stripefailuremessage = $stripe->error;
 						$stripefailuredeclinecode = $stripe->declinecode;
 					}
-				} elseif (preg_match('/acct_/i', $source))
-				{
+				} elseif (preg_match('/acct_/i', $source)) {
 					$charge = \Stripe\Charge::create(array(
 						"amount" => "$stripeamount",
 						"currency" => "$currency",
@@ -977,8 +987,7 @@ class Stripe extends CommonObject
 						"customer" => "$customer"
 					);
 
-					if ($societe->email && $usethirdpartyemailforreceiptemail)
-					{
+					if ($societe->email && $usethirdpartyemailforreceiptemail) {
 						$paymentarray["receipt_email"] = $societe->email;
 					}
 
@@ -993,8 +1002,11 @@ class Stripe extends CommonObject
 					$fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
 				}
 
-				if (!in_array($currency, $arrayzerounitcurrency)) $stripefee = round($fee * 100);
-				else $stripefee = round($fee);
+				if (!in_array($currency, $arrayzerounitcurrency)) {
+					$stripefee = round($fee * 100);
+				} else {
+					$stripefee = round($fee);
+				}
 
 				$paymentarray = array(
 					"amount" => "$stripeamount",
@@ -1006,17 +1018,14 @@ class Stripe extends CommonObject
 					"source" => "$source",
 					"customer" => "$customer"
 				);
-				if ($conf->entity != $conf->global->STRIPECONNECT_PRINCIPAL && $stripefee > 0)
-				{
+				if ($conf->entity != $conf->global->STRIPECONNECT_PRINCIPAL && $stripefee > 0) {
 					$paymentarray["application_fee_amount"] = $stripefee;
 				}
-				if ($societe->email && $usethirdpartyemailforreceiptemail)
-				{
+				if ($societe->email && $usethirdpartyemailforreceiptemail) {
 					$paymentarray["receipt_email"] = $societe->email;
 				}
 
-				if (preg_match('/pm_/i', $source))
-				{
+				if (preg_match('/pm_/i', $source)) {
 					$stripecard = $source;
 					$amountstripe = $stripeamount;
 					$FULLTAG = 'PFBO'; // Payment From Back Office
@@ -1033,8 +1042,7 @@ class Stripe extends CommonObject
 					$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $invoice, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
 
 					$charge = new stdClass();
-					if ($paymentintent->status == 'succeeded')
-					{
+					if ($paymentintent->status == 'succeeded') {
 						$charge->status = 'ok';
 						$charge->id = $paymentintent->id;
 					} else {
@@ -1047,13 +1055,13 @@ class Stripe extends CommonObject
 					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$description", "stripe_account" => "$account"));
 				}
 			}
-			if (isset($charge->id)) {}
+			if (isset($charge->id)) {
+			}
 
 			$return->statut = 'success';
 			$return->id = $charge->id;
 
-			if (preg_match('/pm_/i', $source))
-			{
+			if (preg_match('/pm_/i', $source)) {
 				$return->message = 'Payment retrieved by card status = '.$charge->status;
 			} else {
 				if ($charge->source->type == 'card') {
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index c7fa11df498..453eeb2ae64 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -44,8 +44,7 @@ $stripearrayofkeysbyenv = array(
 );
 
 $stripearrayofkeys = array();
-if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
-{
+if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')) {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[0]; // Test
 } else {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[1]; // Live
diff --git a/htdocs/stripe/lib/stripe.lib.php b/htdocs/stripe/lib/stripe.lib.php
index f1d03ae39be..8749847b958 100644
--- a/htdocs/stripe/lib/stripe.lib.php
+++ b/htdocs/stripe/lib/stripe.lib.php
@@ -67,52 +67,53 @@ function html_print_stripe_footer($fromcompany, $langs)
 
 	// Juridical status
 	$line1 = "";
-	if ($fromcompany->forme_juridique_code)
-	{
+	if ($fromcompany->forme_juridique_code) {
 		$line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
 	}
 	// Capital
-	if ($fromcompany->capital)
-	{
+	if ($fromcompany->capital) {
 		$line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
 	}
 
 	$reg = array();
 
 	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
-	{
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2)) {
 		$field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
 	}
 	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
+	if ($fromcompany->idprof2) {
 		$field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
 	}
 
 	// Second line of company infos
 	$line2 = "";
 	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
+	if ($fromcompany->idprof3) {
 		$field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
 	}
 	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
+	if ($fromcompany->idprof4) {
 		$field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
 	}
 	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
+	if ($fromcompany->tva_intra != '') {
 		$line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
 	}
 
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index baa4497f4f2..68d3a759bf5 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -26,14 +26,18 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -41,7 +45,9 @@ $rowid = GETPOST("rowid", 'alpha');
 $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;
@@ -110,15 +116,13 @@ if (!$rowid) {
 	print "</tr>\n";
 
 	try {
-		if ($stripeacc)
-		{
+		if ($stripeacc) {
 			$payout = \Stripe\Payout::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
 		} else {
 			$payout = \Stripe\Payout::all(array("limit" => $limit));
 		}
 
-		foreach ($payout->data as $payout)
-		{
+		foreach ($payout->data as $payout) {
 			//$charge = $payout;
 			//var_dump($payout);
 
@@ -157,7 +161,9 @@ if (!$rowid) {
 			print '<tr class="oddeven">';
 
 			// Ref
-			if (!empty($stripeacc)) $connect = $stripeacc.'/';
+			if (!empty($stripeacc)) {
+				$connect = $stripeacc.'/';
+			}
 
 			$url = 'https://dashboard.stripe.com/'.$connect.'test/payouts/'.$payout->id;
 			if ($servicestatus) {
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 60e09c5d743..9206507464b 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -26,14 +26,18 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe'));
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 //$result = restrictedArea($user, 'salaries', '', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -41,7 +45,9 @@ $rowid = GETPOST("rowid", 'alpha');
 $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;
@@ -60,8 +66,7 @@ $stripe = new Stripe($db);
 
 llxHeader('', $langs->trans("StripeTransactionList"));
 
-if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')))
-{
+if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
@@ -77,7 +82,9 @@ $stripeacc = $stripe->getStripeAccount($service);
 
 if (!$rowid) {
 	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">';
@@ -106,15 +113,13 @@ if (!$rowid) {
 	print "</tr>\n";
 
 	try {
-		if ($stripeacc)
-		{
+		if ($stripeacc) {
 			$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
 		} else {
 			$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
 		}
 
-		foreach ($txn->data as $txn)
-		{
+		foreach ($txn->data as $txn) {
 			//$charge = $txn;
 			//var_dump($txn);
 
@@ -153,7 +158,9 @@ if (!$rowid) {
 			print '<tr class="oddeven">';
 
 			// Ref
-			if (!empty($stripeacc)) $connect = $stripeacc.'/';
+			if (!empty($stripeacc)) {
+				$connect = $stripeacc.'/';
+			}
 
 			// Ref
 			if (preg_match('/po_/i', $txn->source)) {
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 1663ded21ad..035be6ff86d 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -31,13 +31,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 = 'supplier_proposal'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -72,8 +76,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -86,8 +89,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -99,8 +101,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 8e906f2aa57..f4b63f25cd7 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -26,8 +26,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 	// Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'supplier_proposal'));
@@ -38,14 +39,18 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 
 $elementtype = 'supplier_proposaldet'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -77,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>";
@@ -91,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'));
 
@@ -104,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/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 9b69d12776a..637db7baef3 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -50,8 +50,9 @@ if (!empty($conf->projet->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'supplier_proposal', 'compta', 'bills', 'propal', 'orders', 'products', 'deliveries', 'sendings'));
-if (!empty($conf->margin->enabled))
+if (!empty($conf->margin->enabled)) {
 	$langs->load('margins');
+}
 
 $error = 0;
 
@@ -75,7 +76,9 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
 $NBLINES = 4;
 
 // Security check
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'supplier_proposal', $id);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -90,10 +93,12 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref);
-	if ($ret > 0)
+	if ($ret > 0) {
 		$ret = $object->fetch_thirdparty();
-	if ($ret < 0)
+	}
+	if ($ret < 0) {
 		dol_print_error('', $object->error);
+	}
 }
 
 // Common permissions
@@ -121,14 +126,13 @@ $permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -142,10 +146,8 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes')
-	{
-		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
-		{
+	if ($action == 'confirm_clone' && $confirm == 'yes') {
+		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
 			if ($object->id > 0) {
@@ -159,11 +161,8 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Delete askprice
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
-	{
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) {
+		// Delete askprice
 		$result = $object->delete($user);
 		if ($result > 0) {
 			header('Location: '.DOL_URL_ROOT.'/supplier_proposal/list.php');
@@ -172,15 +171,13 @@ if (empty($reshook))
 			$langs->load("errors");
 			setEventMessages($langs->trans($object->error), null, 'errors');
 		}
-	}
-
-	// Remove line
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
-	{
+	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) {
+		// Remove line
 		$result = $object->deleteline($lineid);
 		// reorder lines
-		if ($result)
+		if ($result) {
 			$object->line_order(true);
+		}
 
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			// Define output language
@@ -196,23 +193,21 @@ if (empty($reshook))
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit();
-	}
-
-	// Validation
-	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
-	{
+	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate) {
+		// Validation
 		$result = $object->valid($user);
-		if ($result >= 0)
-		{
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+		if ($result >= 0) {
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						// 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);
@@ -225,18 +220,19 @@ if (empty($reshook))
 			}
 		} else {
 			$langs->load("errors");
-			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
-			else setEventMessages($langs->trans($object->error), null, 'errors');
+			if (count($object->errors) > 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans($object->error), null, 'errors');
+			}
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
 		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
-		if ($result < 0)
+		if ($result < 0) {
 			dol_print_error($db, $object->error);
-	}
-
-	// Create supplier proposal
-	elseif ($action == 'add' && $usercancreate)
-	{
+		}
+	} elseif ($action == 'add' && $usercancreate) {
+		// Create supplier proposal
 		$object->socid = $socid;
 		$object->fetch_thirdparty();
 
@@ -248,13 +244,11 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// Si on a selectionne une demande a copier, on realise la copie
-			if (GETPOST('createmode') == 'copy' && GETPOST('copie_supplier_proposal'))
-			{
+			if (GETPOST('createmode') == 'copy' && GETPOST('copie_supplier_proposal')) {
 				if ($object->fetch(GETPOST('copie_supplier_proposal')) > 0) {
 					$object->ref = GETPOST('ref');
 					$object->date_livraison = $date_delivery; // deprecated
@@ -294,8 +288,7 @@ if (empty($reshook))
 				$object->origin_id = GETPOST('originid');
 
 				// Multicurrency
-				if (!empty($conf->multicurrency->enabled))
-				{
+				if (!empty($conf->multicurrency->enabled)) {
 					$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				}
 
@@ -307,10 +300,8 @@ if (empty($reshook))
 				}
 			}
 
-			if (!$error)
-			{
-				if ($origin && $originid)
-				{
+			if (!$error) {
+				if ($origin && $originid) {
 					$element = 'supplier_proposal';
 					$subelement = 'supplier_proposal';
 
@@ -324,8 +315,7 @@ if (empty($reshook))
 					}
 
 					$id = $object->create($user);
-					if ($id > 0)
-					{
+					if ($id > 0) {
 						dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 						$classname = ucfirst($subelement);
@@ -334,19 +324,16 @@ if (empty($reshook))
 						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 						$result = $srcobject->fetch($object->origin_id);
 
-						if ($result > 0)
-						{
+						if ($result > 0) {
 							$lines = $srcobject->lines;
-							if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
-							{
+							if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {
 								$srcobject->fetch_lines();
 								$lines = $srcobject->lines;
 							}
 
 							$fk_parent_line = 0;
 							$num = count($lines);
-							for ($i = 0; $i < $num; $i++)
-							{
+							for ($i = 0; $i < $num; $i++) {
 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
 								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->libelle);
 
@@ -381,7 +368,8 @@ if (empty($reshook))
 									$lines[$i]->special_code,
 									$fk_parent_line,
 									$lines[$i]->fk_fournprice,
-									$lines[$i]->pa_ht, $label,
+									$lines[$i]->pa_ht,
+									$label,
 									$array_options,
 									$lines[$i]->ref_supplier,
 									$lines[$i]->fk_unit
@@ -416,24 +404,25 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				} 			// Standard creation
-				else {
+				} else {
+					// Standard creation
 					$id = $object->create($user);
 				}
 
-				if ($id > 0)
-				{
-					if (!$error)
-					{
+				if ($id > 0) {
+					if (!$error) {
 						$db->commit();
 
 						// Define output language
-						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-						{
+						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 							$outputlangs = $langs;
 							$newlang = '';
-							if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-							if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+							if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+								$newlang = GETPOST('lang_id', 'aZ09');
+							}
+							if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+								$newlang = $object->thirdparty->default_lang;
+							}
 							if (!empty($newlang)) {
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
@@ -442,7 +431,9 @@ if (empty($reshook))
 
 							$ret = $object->fetch($id); // Reload to get new records
 							$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-							if ($result < 0) dol_print_error($db, $result);
+							if ($result < 0) {
+								dol_print_error($db, $result);
+							}
 						}
 
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
@@ -458,26 +449,20 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Reopen proposal
-	elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {
+	} elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {
+		// Reopen proposal
 		// prevent browser refresh from reopening proposal several times
 		if ($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) {
 			$object->reopen($user, SupplierProposal::STATUS_VALIDATED);
 		}
-	}
-
-	// Close proposal
-	elseif ($action == 'close' && $usercanclose && !GETPOST('cancel', 'alpha')) {
+	} elseif ($action == 'close' && $usercanclose && !GETPOST('cancel', 'alpha')) {
+		// Close proposal
 		// prevent browser refresh from reopening proposal several times
 		if ($object->statut == SupplierProposal::STATUS_SIGNED) {
 			$object->setStatut(SupplierProposal::STATUS_CLOSE);
 		}
-	}
-
-	// Set accepted/refused
-	elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) {
+	} elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) {
+		// Set accepted/refused
 		if (!GETPOST('statut')) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CloseAs")), null, 'errors');
 			$action = 'statut';
@@ -505,12 +490,10 @@ if (empty($reshook))
 
 
 	// Go back to draft
-	if ($action == 'modif' && $usercancreate)
-	{
+	if ($action == 'modif' && $usercancreate) {
 		$object->setDraft($user);
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		{
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			// Define output language
 			$outputlangs = $langs;
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
@@ -521,7 +504,7 @@ if (empty($reshook))
 			$ret = $object->fetch($id); // Reload to get new records
 			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}	elseif ($action == "setabsolutediscount" && $usercancreate) {
+	} elseif ($action == "setabsolutediscount" && $usercancreate) {
 		if ($_POST["remise_id"]) {
 			if ($object->id > 0) {
 				$result = $object->insert_discount($_POST["remise_id"]);
@@ -533,8 +516,7 @@ if (empty($reshook))
 	}
 
 	// Add a product line
-	if ($action == 'addline' && $usercancreate)
-	{
+	if ($action == 'addline' && $usercancreate) {
 		$langs->load('errors');
 		$error = 0;
 
@@ -575,8 +557,7 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && $price_ht_devise === '') 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
-		{
+		if ($prod_entry_mode == 'free' && empty($idprod) && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && $price_ht_devise === '') { 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPrice")), null, 'errors');
 			$error++;
 		}
@@ -585,8 +566,8 @@ if (empty($reshook))
 			$error++;
 		}
 		if (!$error && ($qty >= 0)) {
-		    $pu_ht = price2num($price_ht, 'MU');
-		    $pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+			$pu_ht = price2num($price_ht, 'MU');
+			$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 			$price_min = 0;
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
@@ -595,50 +576,50 @@ if (empty($reshook))
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
 			// Ecrase $txtva par celui du produit
-			if (($prod_entry_mode != 'free') && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
-			{
+			if (($prod_entry_mode != 'free') && empty($error)) {	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 				$productsupplier = new ProductFournisseur($db);
 
 				$idprod = 0;
-				if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') $idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+				if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') {
+					$idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+				}
 
 				$reg = array();
-				if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg))
-				{
+				if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg)) {
 					$idprod = $reg[1];
 					$res = $productsupplier->fetch($idprod); // Load product from its ID
 					// Call to init some price properties of $productsupplier
 					// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
-					if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER))
-					{
+					if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
 						$fksoctosearch = 0;
 						$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
-						if ($productsupplier->fourn_socid != $socid)	// The price we found is for another supplier, so we clear supplier price
-						{
+						if ($productsupplier->fourn_socid != $socid) {	// The price we found is for another supplier, so we clear supplier price
 							$productsupplier->ref_supplier = '';
 						}
 					} else {
 						$fksoctosearch = $object->thirdparty->id;
 						$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 					}
-				} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
-				{
+				} elseif (GETPOST('idprodfournprice', 'alpha') > 0) {
 					//$qtytosearch=$qty; 	   // Just to see if a price exists for the quantity. Not used to found vat.
 					$qtytosearch = -1; // We force qty to -1 to be sure to find if the supplier price that exists
 					$idprod = $productsupplier->get_buyprice(GETPOST('idprodfournprice', 'alpha'), $qtytosearch);
 					$res = $productsupplier->fetch($idprod);
 				}
 
-				if ($idprod > 0)
-				{
+				if ($idprod > 0) {
 					$label = $productsupplier->label;
 
 					// if we use supplier description of the products
 					if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
 						$desc = $productsupplier->desc_supplier;
-					} else $desc = $productsupplier->description;
+					} else {
+						$desc = $productsupplier->description;
+					}
 
-					if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					if (trim($product_desc) != trim($desc)) {
+						$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					}
 
 					$type = $productsupplier->type;
 					$price_base_type = ($productsupplier->fourn_price_base_type ? $productsupplier->fourn_price_base_type : 'HT');
@@ -647,11 +628,15 @@ if (empty($reshook))
 
 					$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
 					$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
-					if (empty($tva_tx)) $tva_npr = 0;
+					if (empty($tva_tx)) {
+						$tva_npr = 0;
+					}
 					$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
 					$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
-					if (empty($pu_ht)) $pu_ht = 0; // If pu is '' or null, we force to have a numeric value
+					if (empty($pu_ht)) {
+						$pu_ht = 0; // If pu is '' or null, we force to have a numeric value
+					}
 
 					// If GETPOST('idprodfournprice') is a numeric, we can use it. If it is empty or if it is 'idprod_123', we should use -1 (not used)
 					$fournprice = (is_numeric(GETPOST('idprodfournprice', 'alpha')) ? GETPOST('idprodfournprice', 'alpha') : -1);
@@ -688,28 +673,24 @@ if (empty($reshook))
 					);
 
 					//var_dump($tva_tx);var_dump($productsupplier->fourn_pu);var_dump($price_base_type);exit;
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
-				if ($idprod == -99 || $idprod == 0)
-				{
+				if ($idprod == -99 || $idprod == 0) {
 					// Product not selected
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")).' '.$langs->trans("or").' '.$langs->trans("NoPriceDefinedForThisSupplier"), null, 'errors');
 				}
-				if ($idprod == -1)
-				{
+				if ($idprod == -1) {
 					// Quantity too low
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 				}
-			} elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error))    // Free product.  // $price_ht is already set
-			{
+			} elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error)) {    // Free product.  // $price_ht is already set
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
@@ -728,8 +709,7 @@ if (empty($reshook))
 				$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 				$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-				if ($price_ht !== '')
-				{
+				if ($price_ht !== '') {
 					$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 				} else {
 					$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
@@ -762,23 +742,26 @@ if (empty($reshook))
 					$fk_unit,
 					'', // origin
 					0, // origin_id
-					$pu_ht_devise);
+					$pu_ht_devise
+				);
 			}
 
 
-			if (!$error && $result > 0)
-			{
+			if (!$error && $result > 0) {
 				$db->commit();
 
 				$ret = $object->fetch($object->id); // Reload to get new records
 
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				{
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						$newlang = GETPOST('lang_id', 'aZ09');
+					}
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+						$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -787,7 +770,9 @@ if (empty($reshook))
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-					if ($result < 0) dol_print_error($db, $result);
+					if ($result < 0) {
+						dol_print_error($db, $result);
+					}
 				}
 
 				unset($_POST['prod_entry_mode']);
@@ -832,16 +817,15 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Mise a jour d'une ligne dans la demande de prix
-	elseif ($action == 'updateline' && $usercancreate && GETPOST('save') == $langs->trans("Save")) {
+	} elseif ($action == 'updateline' && $usercancreate && GETPOST('save') == $langs->trans("Save")) {
+		// Mise a jour d'une ligne dans la demande de prix
 		$vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0);
 
 		// Define info_bits
 		$info_bits = 0;
-		if (preg_match('/\*/', $vat_rate))
+		if (preg_match('/\*/', $vat_rate)) {
 			$info_bits |= 0x01;
+		}
 
 		// Clean parameters
 		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml'));
@@ -851,17 +835,14 @@ if (empty($reshook))
 		$localtax1_rate = get_localtax($vat_rate, 1, $mysoc, $object->thirdparty);
 		$localtax2_rate = get_localtax($vat_rate, 2, $mysoc, $object->thirdparty);
 
-		if (GETPOST('price_ht') != '')
-		{
+		if (GETPOST('price_ht') != '') {
 			$ht = price2num(GETPOST('price_ht'));
 		}
 
-		if (GETPOST('price_ttc') != '')
-		{
+		if (GETPOST('price_ttc') != '') {
 			$reg = array();
 			$vatratecleaned = $vat_rate;
-			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg))      // If vat is "xx (yy)"
-			{
+			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg)) {      // If vat is "xx (yy)"
 				$vatratecleaned = trim($reg[1]);
 				$vatratecode = $reg[2];
 			}
@@ -889,16 +870,16 @@ if (empty($reshook))
 
 		// Define special_code for special lines
 		$special_code = GETPOST('special_code');
-		if (!GETPOST('qty')) $special_code = 3;
+		if (!GETPOST('qty')) {
+			$special_code = 3;
+		}
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');
 		if (!empty($productid)) {
 			$productsupplier = new ProductFournisseur($db);
-			if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
-			{
-				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $productid, 'none', GETPOST('socid', 'int')) < 0)
-				{
+			if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) {
+				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $productid, 'none', GETPOST('socid', 'int')) < 0) {
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 				}
 			}
@@ -909,8 +890,9 @@ if (empty($reshook))
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level))
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min [$object->thirdparty->price_level];
+			}
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 		} else {
@@ -1001,61 +983,51 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}	elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
+	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
-	}
-
-	// Set project
-	elseif ($action == 'classin' && $usercancreate) {
+	} elseif ($action == 'classin' && $usercancreate) {
+		// Set project
 		$object->setProject(GETPOST('projectid'), 'int');
-	}
-
-	// Delivery delay
-	elseif ($action == 'setavailability' && $usercancreate) {
+	} elseif ($action == 'setavailability' && $usercancreate) {
+		// Delivery delay
 		$result = $object->availability($_POST['availability_id']);
-	}
-
-	// Terms of payments
-	elseif ($action == 'setconditions' && $usercancreate) {
+	} elseif ($action == 'setconditions' && $usercancreate) {
+		// Terms of payments
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise_percent($user, price2num(GETPOST('remise_percent'), 2));
 	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		$result = $object->set_remise_absolue($user, price2num(GETPOST('remise_absolue'), 'MU'));
-	}
-
-	// Payment mode
-	elseif ($action == 'setmode' && $usercancreate) {
+	} elseif ($action == 'setmode' && $usercancreate) {
+		// Payment mode
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	}
-
-	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+		// Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+		// Multicurrency rate
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
 	} 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('PROPOSAL_SUPPLIER_MODIFY');
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 		}
 
-		if ($error) $action = 'edit_extras';
+		if ($error) {
+			$action = 'edit_extras';
+		}
 	}
 }
 
@@ -1071,24 +1043,25 @@ $formother = new FormOther($db);
 $formfile = new FormFile($db);
 $formmargin = new FormMargin($db);
 $companystatic = new Societe($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $now = dol_now();
 
 // Add new askprice
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$currency_code = $conf->currency;
 
 	print load_fiche_titre($langs->trans("NewAskPrice"), '', 'supplier_proposal');
 
 	$soc = new Societe($db);
-	if ($socid > 0)
+	if ($socid > 0) {
 		$res = $soc->fetch($socid);
+	}
 
 	// Load objectsrc
-	if (!empty($origin) && !empty($originid))
-	{
+	if (!empty($origin) && !empty($originid)) {
 		$element = 'supplier_proposal';
 		$subelement = 'supplier_proposal';
 
@@ -1097,8 +1070,7 @@ if ($action == 'create')
 		$classname = ucfirst($subelement);
 		$objectsrc = new $classname($db);
 		$objectsrc->fetch($originid);
-		if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
-		{
+		if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 			$objectsrc->fetch_lines();
 		}
 		$objectsrc->fetch_thirdparty();
@@ -1115,15 +1087,20 @@ if ($action == 'create')
 		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
 
-		if (!empty($conf->multicurrency->enabled))
-		{
-			if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
-			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
+		if (!empty($conf->multicurrency->enabled)) {
+			if (!empty($objectsrc->multicurrency_code)) {
+				$currency_code = $objectsrc->multicurrency_code;
+			}
+			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
+				$currency_tx = $objectsrc->multicurrency_tx;
+			}
 		}
 	} else {
 		$cond_reglement_id 	= $soc->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $soc->mode_reglement_supplier_id;
-		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;
+		}
 	}
 
 	$object = new SupplierProposal($db);
@@ -1159,8 +1136,7 @@ if ($action == 'create')
 	}
 	print '</tr>'."\n";
 
-	if ($soc->id > 0)
-	{
+	if ($soc->id > 0) {
 		// Discounts for third party
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
 
@@ -1224,13 +1200,14 @@ if ($action == 'create')
 	print "</td></tr>";
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 
 		$formproject = new FormProjets($db);
 
-		if ($origin == 'project') $projectid = ($originid ? $originid : 0);
+		if ($origin == 'project') {
+			$projectid = ($originid ? $originid : 0);
+		}
 
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
@@ -1260,8 +1237,7 @@ if ($action == 'create')
 
 
 	// Lines from source
-	if (!empty($origin) && !empty($originid) && is_object($objectsrc))
-	{
+	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
 		// TODO for compatibility
 		if ($origin == 'contrat') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
@@ -1272,28 +1248,25 @@ if ($action == 'create')
 
 		print "\n<!-- ".$classname." info -->";
 		print "\n";
-		print '<input type="hidden" name="amount"         value="'.$objectsrc->total_ht.'">'."\n";
-		print '<input type="hidden" name="total"          value="'.$objectsrc->total_ttc.'">'."\n";
-		print '<input type="hidden" name="tva"            value="'.$objectsrc->total_tva.'">'."\n";
-		print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-		print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+		print '<input type="hidden" name="amount"   value="'.$objectsrc->total_ht.'">'."\n";
+		print '<input type="hidden" name="total"    value="'.$objectsrc->total_ttc.'">'."\n";
+		print '<input type="hidden" name="tva"      value="'.$objectsrc->total_tva.'">'."\n";
+		print '<input type="hidden" name="origin"   value="'.$objectsrc->element.'">';
+		print '<input type="hidden" name="originid" value="'.$objectsrc->id.'">';
 
 		print '<tr><td>'.$langs->trans('CommRequest').'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
-		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1
-		{
+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) { 		// Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
 		}
 
-		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2
-		{
+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) { 		// Localtax2
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
 		}
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -1305,12 +1278,13 @@ if ($action == 'create')
 
 	/*
 	 * Combobox pour la fonction de copie
- 	 */
+	  */
 
-	if (empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '<input type="hidden" name="createmode" value="empty">';
+	if (empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) {
+		print '<input type="hidden" name="createmode" value="empty">';
+	}
 
-	if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE))
-	{
+	if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) {
 		print '<br><table>';
 
 		// For backward compatibility
@@ -1349,7 +1323,9 @@ if ($action == 'create')
 		print '<td valign="top" colspan="2">'.$langs->trans("CreateEmptyAsk").'</td></tr>';
 	}
 
-	if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) print '</table>';
+	if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) {
+		print '</table>';
+	}
 
 	print dol_get_fiche_end();
 
@@ -1392,32 +1368,29 @@ if ($action == 'create')
 	if ($action == 'clone') {
 		// Create an array for form
 		$formquestion = array(
-							// 'text' => $langs->trans("ConfirmClone"),
-							// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-							// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' =>
-							// 1),
-							array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', 's.fournisseur=1')));
+			// 'text' => $langs->trans("ConfirmClone"),
+			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' =>
+			// 1),
+			array(
+				'type' => 'other',
+				'name' => 'socid',
+				'label' => $langs->trans("SelectThirdParty"),
+				'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', 's.fournisseur=1'))
+			);
 		// Paiement incomplet. On demande si motif = escompte ou autre
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-	}
-
-	// Confirm delete
-	elseif ($action == 'delete') {
+	} elseif ($action == 'delete') {
+		// Confirm delete
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteAsk'), $langs->trans('ConfirmDeleteAsk', $object->ref), 'confirm_delete', '', 0, 1);
-	}
-
-	// Confirm reopen
-	elseif ($action == 'reopen') {
+	} elseif ($action == 'reopen') {
+		// Confirm reopen
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenAsk', $object->ref), 'confirm_reopen', '', 0, 1);
-	}
-
-	// Confirmation delete product/service line
-	elseif ($action == 'ask_deleteline') {
+	} elseif ($action == 'ask_deleteline') {
+		// Confirmation delete product/service line
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
-	}
-
-	// Confirm validate askprice
-	elseif ($action == 'validate') {
+	} elseif ($action == 'validate') {
+		// Confirm validate askprice
 		$error = 0;
 
 		// on verifie si l'objet est en numerotation provisoire
@@ -1440,15 +1413,19 @@ if ($action == 'create')
 			$text .= $notify->confirmMessage('PROPOSAL_SUPPLIER_VALIDATE', $object->socid, $object);
 		}
 
-		if (!$error)
+		if (!$error) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateAsk'), $text, 'confirm_validate', '', 0, 1);
+		}
 	}
 
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -1464,14 +1441,14 @@ if ($action == 'create')
 	//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
+	}
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($usercancreate)
-		{
+		if ($usercancreate) {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 			}
@@ -1538,8 +1515,9 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($action != 'editconditions' && $object->statut != SupplierProposal::STATUS_NOTSIGNED)
+	if ($action != 'editconditions' && $object->statut != SupplierProposal::STATUS_NOTSIGNED) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($action == 'editconditions') {
@@ -1556,8 +1534,9 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DeliveryDate');
 	print '</td>';
-	if ($action != 'editdate_livraison' && $object->statut == SupplierProposal::STATUS_VALIDATED)
+	if ($action != 'editdate_livraison' && $object->statut == SupplierProposal::STATUS_VALIDATED) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($action == 'editdate_livraison') {
@@ -1579,8 +1558,9 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && $object->statut != SupplierProposal::STATUS_NOTSIGNED)
+	if ($action != 'editmode' && $object->statut != SupplierProposal::STATUS_NOTSIGNED) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($action == 'editmode') {
@@ -1591,16 +1571,16 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
+	if (!empty($conf->multicurrency->enabled)) {
 		// Multicurrency code
 		print '<tr>';
 		print '<td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
-		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_VALIDATED)
+		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_VALIDATED) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editmulticurrencycode') {
@@ -1611,20 +1591,20 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Multicurrency rate
-		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
-		{
+		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 			print '<tr>';
 			print '<td>';
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
-			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_VALIDATED && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
+			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_VALIDATED && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td colspan="3">';
 			if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
 				if ($action == 'actualizemulticurrencyrate') {
-	   				list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+					list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
 				}
 				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
 			} else {
@@ -1653,15 +1633,15 @@ if ($action == 'create')
 		print '</tr>';
 	}*/
 
-	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled))
-	{
+	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled)) {
 		// Bank Account
 		print '<tr><td>';
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('BankAccount');
 		print '</td>';
-		if ($action != 'editbankaccount' && $usercancreate)
+		if ($action != 'editbankaccount' && $usercancreate) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editbankaccount') {
@@ -1686,8 +1666,7 @@ if ($action == 'create')
 
 	print '<table class="border tableforfield centpercent">';
 
-	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
-	{
+	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
 		print '<td>'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -1715,14 +1694,12 @@ if ($action == 'create')
 	print '</tr>';
 
 	// Amount Local Taxes
-	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 	// Localtax1
-	{
+	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { 	// Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td class="nowrap">'.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 		print '</tr>';
 	}
-	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 	// Localtax2
-	{
+	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { 	// Localtax2
 		print '<tr><td height="10">'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td class="nowrap">'.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 		print '</tr>';
@@ -1783,16 +1760,17 @@ if ($action == 'create')
 	global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
 	$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
 	$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty.
-	if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier = 1;
+	if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) {
+		$senderissupplier = 1;
+	}
 
-	if (!empty($object->lines))
+	if (!empty($object->lines)) {
 		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, $dateSelector);
+	}
 
 	// Form to add new line
-	if ($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate)
-	{
-		if ($action != 'editline')
-		{
+	if ($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) {
+		if ($action != 'editline') {
 			// Add products/services form
 			$object->formAddObjectLine($dateSelector, $soc, $mysoc);
 
@@ -1807,14 +1785,15 @@ if ($action == 'create')
 
 	print dol_get_fiche_end();
 
-	if ($action == 'statut')
-	{
+	if ($action == 'statut') {
 		// Form to set proposal accepted/refused
 		$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST" id="formacceptrefuse" class="formconsumeproduce">';
 		$form_close .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$form_close .= '<input type="hidden" name="action" value="setstatut">';
 
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) $form_close .= '<p class="notice">'.$langs->trans('SupplierProposalRefFournNotice').'</p>'; // TODO Suggest a permanent checkbox instead of option
+		if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) {
+			$form_close .= '<p class="notice">'.$langs->trans('SupplierProposalRefFournNotice').'</p>'; // TODO Suggest a permanent checkbox instead of option
+		}
 		$form_close .= '<table class="border centpercent">';
 		$form_close .= '<tr><td width="150"  class="left">'.$langs->trans("CloseAs").'</td><td class="left">';
 		$form_close .= '<select id="statut" name="statut" class="flat">';
@@ -1845,15 +1824,13 @@ if ($action == 'create')
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 																									   // modified by hook
-		if (empty($reshook))
-		{
-			if ($action != 'statut' && $action != 'editline')
-			{
+		if (empty($reshook)) {
+			if ($action != 'statut' && $action != 'editline') {
 				// Validate
-				if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 && $usercanvalidate)
-				{
-					if (count($object->lines) > 0)
+				if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 && $usercanvalidate) {
+					if (count($object->lines) > 0) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a></div>';
+					}
 					// else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
 				}
 
@@ -1873,7 +1850,9 @@ if ($action == 'create')
 					if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
 						if ($usercansend) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						}
 					}
 				}
 
@@ -1912,8 +1891,7 @@ if ($action == 'create')
 		print '</div>';
 	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 
 		/*
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index bf91be32d8d..953f1d274fe 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -33,7 +33,7 @@ class Supplierproposals extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'socid'
 	);
 
@@ -105,28 +105,37 @@ class Supplierproposals 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."supplier_proposal as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('propal').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -135,8 +144,7 @@ class Supplierproposals extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -146,13 +154,11 @@ class Supplierproposals extends DolibarrApi
 
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$propal_static = new SupplierProposal($this->db);
 				if ($propal_static->fetch($obj->rowid)) {
@@ -181,8 +187,9 @@ class Supplierproposals extends DolibarrApi
 	{
 		$propal = array();
 		foreach (SupplierProposals::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$propal[$field] = $data[$field];
 		}
 		return $propal;
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index c56fac31a3f..f413dfa2f78 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -254,11 +254,12 @@ class SupplierProposal extends CommonObject
 		// phpcs:enable
 		global $conf, $mysoc;
 
-		if (!$qty) $qty = 1;
+		if (!$qty) {
+			$qty = 1;
+		}
 
 		dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
-		if ($idproduct > 0)
-		{
+		if ($idproduct > 0) {
 			$prod = new Product($this->db);
 			$prod->fetch($idproduct);
 
@@ -266,13 +267,14 @@ class SupplierProposal extends CommonObject
 
 			$tva_tx = get_default_tva($mysoc, $this->thirdparty, $prod->id);
 			$tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
-			if (empty($tva_tx)) $tva_npr = 0;
+			if (empty($tva_tx)) {
+				$tva_npr = 0;
+			}
 			$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
 			$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $this->thirdparty, $tva_npr);
 
 			// multiprix
-			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
-			{
+			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) {
 				$price = $prod->multiprices[$this->thirdparty->price_level];
 			} else {
 				$price = $prod->price;
@@ -311,10 +313,8 @@ class SupplierProposal extends CommonObject
 		$remise = new DiscountAbsolute($this->db);
 		$result = $remise->fetch($idremise);
 
-		if ($result > 0)
-		{
-			if ($remise->fk_facture)	// Protection against multiple submission
-			{
+		if ($result > 0) {
+			if ($remise->fk_facture) {	// Protection against multiple submission
 				$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
 				$this->db->rollback();
 				return -5;
@@ -338,11 +338,9 @@ class SupplierProposal extends CommonObject
 			$supplier_proposalligne->total_ttc = -$remise->amount_ttc;
 
 			$result = $supplier_proposalligne->insert();
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result = $this->update_price(1);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -405,12 +403,24 @@ class SupplierProposal extends CommonObject
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Clean parameters
-		if (empty($remise_percent)) $remise_percent = 0;
-		if (empty($qty)) $qty = 0;
-		if (empty($info_bits)) $info_bits = 0;
-		if (empty($rang)) $rang = 0;
-		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
-		if (empty($pu_ht)) $pu_ht = 0;
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
+		if (empty($qty)) {
+			$qty = 0;
+		}
+		if (empty($info_bits)) {
+			$info_bits = 0;
+		}
+		if (empty($rang)) {
+			$rang = 0;
+		}
+		if (empty($fk_parent_line) || $fk_parent_line < 0) {
+			$fk_parent_line = 0;
+		}
+		if (empty($pu_ht)) {
+			$pu_ht = 0;
+		}
 
 		$remise_percent = price2num($remise_percent);
 		$qty = price2num($qty);
@@ -422,29 +432,26 @@ class SupplierProposal extends CommonObject
 		$txlocaltax1 = price2num($txlocaltax1);
 		$txlocaltax2 = price2num($txlocaltax2);
 		$pa_ht = price2num($pa_ht);
-		if ($price_base_type == 'HT')
-		{
+		if ($price_base_type == 'HT') {
 			$pu = $pu_ht;
 		} else {
 			$pu = $pu_ttc;
 		}
 
 		// Check parameters
-		if ($type < 0) return -1;
+		if ($type < 0) {
+			return -1;
+		}
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			$this->db->begin();
 
-			if ($fk_product > 0)
-			{
-				if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
-				{
+			if ($fk_product > 0) {
+				if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) {
 					// Check quantity is enough
 					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_fournprice=".$fk_fournprice." qty=".$qty." ref_supplier=".$ref_supplier);
 					$prod = new Product($this->db);
-					if ($prod->fetch($fk_product) > 0)
-					{
+					if ($prod->fetch($fk_product) > 0) {
 						$product_type = $prod->type;
 						$label = $prod->label;
 						$fk_prod_fourn_price = $fk_fournprice;
@@ -452,16 +459,15 @@ class SupplierProposal extends CommonObject
 						// We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
 						// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
 						$result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
-						if ($result > 0)
-						{
+						if ($result > 0) {
 							$pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
 							$ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
 							// is remise percent not keyed but present for the product we add it
-							if ($remise_percent == 0 && $prod->remise_percent != 0)
+							if ($remise_percent == 0 && $prod->remise_percent != 0) {
 								$remise_percent = $prod->remise_percent;
+							}
 						}
-						if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
-						{
+						if ($result == 0) {                   // If result == 0, we failed to found the supplier reference price
 							$langs->load("errors");
 							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
 							$this->db->rollback();
@@ -470,25 +476,23 @@ class SupplierProposal extends CommonObject
 							//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
 							return -1;
 						}
-						if ($result == -1)
-						{
+						if ($result == -1) {
 							$langs->load("errors");
 							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
 							$this->db->rollback();
 							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
 							return -1;
 						}
-						if ($result < -1)
-						{
+						if ($result < -1) {
 							$this->error = $prod->error;
-			                $this->errors = $prod->errors;
+							$this->errors = $prod->errors;
 							$this->db->rollback();
 							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
 							return -1;
 						}
 					} else {
 						$this->error = $prod->error;
-		                $this->errors = $prod->errors;
+						$this->errors = $prod->errors;
 						$this->db->rollback();
 						return -1;
 					}
@@ -507,8 +511,7 @@ class SupplierProposal extends CommonObject
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -533,8 +536,7 @@ class SupplierProposal extends CommonObject
 
 			// Rang to use
 			$ranktouse = $rang;
-			if ($ranktouse == -1)
-			{
+			if ($ranktouse == -1) {
 				$rangmax = $this->line_max($fk_parent_line);
 				$ranktouse = $rangmax + 1;
 			}
@@ -543,8 +545,7 @@ class SupplierProposal extends CommonObject
 			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
 			$price = $pu;
 			$remise = 0;
-			if ($remise_percent > 0)
-			{
+			if ($remise_percent > 0) {
 				$remise = round(($pu * $remise_percent / 100), 2);
 				$price = $pu - $remise;
 			}
@@ -605,22 +606,24 @@ class SupplierProposal extends CommonObject
 			$this->line->multicurrency_total_ttc	= $multicurrency_total_ttc;
 
 			// Mise en option de la ligne
-			if (empty($qty) && empty($special_code)) $this->line->special_code = 3;
+			if (empty($qty) && empty($special_code)) {
+				$this->line->special_code = 3;
+			}
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				$this->line->array_options = $array_options;
 			}
 
 			$result = $this->line->insert();
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour informations denormalisees au niveau de la propale meme
 				$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$this->db->commit();
 					return $this->line->id;
 				} else {
@@ -631,7 +634,7 @@ class SupplierProposal extends CommonObject
 				}
 			} else {
 				$this->error = $this->line->error;
-                $this->errors = $this->line->errors;
+				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -2;
 			}
@@ -685,11 +688,14 @@ class SupplierProposal extends CommonObject
 		$txlocaltax1 = price2num($txlocaltax1);
 		$txlocaltax2 = price2num($txlocaltax2);
 		$pa_ht = price2num($pa_ht);
-		if (empty($qty) && empty($special_code)) $special_code = 3; // Set option tag
-		if (!empty($qty) && $special_code == 3) $special_code = 0; // Remove option tag
+		if (empty($qty) && empty($special_code)) {
+			$special_code = 3; // Set option tag
+		}
+		if (!empty($qty) && $special_code == 3) {
+			$special_code = 0; // Remove option tag
+		}
 
-		if ($this->statut == 0)
-		{
+		if ($this->statut == 0) {
 			$this->db->begin();
 
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
@@ -702,8 +708,7 @@ class SupplierProposal extends CommonObject
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -738,8 +743,7 @@ class SupplierProposal extends CommonObject
 			$this->line->context = $this->context;
 
 			// Reorder if fk_parent_line change
-			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
-			{
+			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) {
 				$rangmax = $this->line_max($fk_parent_line);
 				$this->line->rang = $rangmax + 1;
 			}
@@ -796,10 +800,11 @@ class SupplierProposal extends CommonObject
 			$this->line->multicurrency_total_ttc	= $multicurrency_total_ttc;
 
 			$result = $this->line->update();
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				$this->update_price(1);
 
@@ -827,15 +832,13 @@ class SupplierProposal extends CommonObject
 	 */
 	public function deleteline($lineid)
 	{
-		if ($this->statut == 0)
-		{
+		if ($this->statut == 0) {
 			$line = new SupplierProposalLine($this->db);
 
 			// For triggers
 			$line->fetch($lineid);
 
-			if ($line->delete() > 0)
-			{
+			if ($line->delete() > 0) {
 				$this->update_price(1);
 
 				return 1;
@@ -867,17 +870,14 @@ class SupplierProposal extends CommonObject
 
 		// Check parameters
 		$result = $this->fetch_thirdparty();
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = "Failed to fetch company";
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -3;
 		}
-		if (!empty($this->ref))	// We check that ref is not already used
-		{
+		if (!empty($this->ref)) {	// We check that ref is not already used
 			$result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->error = 'ErrorRefAlreadyExists';
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
@@ -889,9 +889,10 @@ class SupplierProposal extends CommonObject
 		$delivery_date = empty($this->delivery_date) ? $this->date_livraison : $this->delivery_date;
 
 		// Multicurrency
-		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $now);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code)) {
+			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $now);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = $conf->currency;
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
@@ -953,36 +954,30 @@ class SupplierProposal 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."supplier_proposal");
 
-			if ($this->id)
-			{
+			if ($this->id) {
 				$this->ref = '(PROV'.$this->id.')';
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if (!$resql) $error++;
+				if (!$resql) {
+					$error++;
+				}
 
-				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-				{
+				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {	// To use new linkedObjectsIds instead of old linked_objects
 					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 				}
 
 				// Add object linked
-				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
-				{
-					foreach ($this->linked_objects as $origin => $tmp_origin_id)
-					{
-						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-						{
-							foreach ($tmp_origin_id as $origin_id)
-							{
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) {
+					foreach ($this->linked_objects as $origin => $tmp_origin_id) {
+						if (is_array($tmp_origin_id)) {       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+							foreach ($tmp_origin_id as $origin_id) {
 								$ret = $this->add_object_linked($origin, $origin_id);
-								if (!$ret)
-								{
+								if (!$ret) {
 									dol_print_error($this->db);
 									$error++;
 								}
@@ -992,15 +987,13 @@ class SupplierProposal extends CommonObject
 				}
 
 				/*
-                 *  Insertion du detail des produits dans la base
-                 */
-				if (!$error)
-				{
+				 *  Insertion du detail des produits dans la base
+				 */
+				if (!$error) {
 					$fk_parent_line = 0;
 					$num = count($this->lines);
 
-					for ($i = 0; $i < $num; $i++)
-					{
+					for ($i = 0; $i < $num; $i++) {
 						// Reset fk_parent_line for no child products and special product
 						if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
 							$fk_parent_line = 0;
@@ -1032,8 +1025,7 @@ class SupplierProposal extends CommonObject
 							$this->lines[$i]->rowid
 						);
 
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							$this->error = $this->db->error;
 							dol_print_error($this->db);
@@ -1046,29 +1038,26 @@ class SupplierProposal extends CommonObject
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Mise a jour infos denormalisees
 					$resql = $this->update_price(1);
-					if ($resql)
-					{
+					if ($resql) {
 						$action = 'update';
 
 						// Actions on extra fields
-						if (!$error)
-						{
+						if (!$error) {
 							$result = $this->insertExtraFields();
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$error++;
 							}
 						}
 
-						if (!$error && !$notrigger)
-						{
+						if (!$error && !$notrigger) {
 							// Call trigger
 							$result = $this->call_trigger('PROPOSAL_SUPPLIER_CREATE', $user);
-							if ($result < 0) { $error++; }
+							if ($result < 0) {
+								$error++;
+							}
 							// End call triggers
 						}
 					} else {
@@ -1081,8 +1070,7 @@ class SupplierProposal extends CommonObject
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				dol_syslog(get_class($this)."::create done id=".$this->id);
 				return $this->id;
@@ -1114,8 +1102,9 @@ class SupplierProposal extends CommonObject
 		$this->db->begin();
 
 		// get extrafields so they will be clone
-		foreach ($this->lines as $line)
+		foreach ($this->lines as $line) {
 			$line->fetch_optionals();
+		}
 
 		// Load source object
 		$objFrom = clone $this;
@@ -1123,10 +1112,8 @@ class SupplierProposal extends CommonObject
 		$objsoc = new Societe($this->db);
 
 		// Change socid if needed
-		if (!empty($fromid) && $fromid != $this->socid)
-		{
-			if ($objsoc->fetch($fromid) > 0)
-			{
+		if (!empty($fromid) && $fromid != $this->socid) {
+			if ($objsoc->fetch($fromid) > 0) {
 				$this->socid = $objsoc->id;
 				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
 				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
@@ -1141,8 +1128,7 @@ class SupplierProposal extends CommonObject
 		$this->id = 0;
 		$this->statut = 0;
 
-		if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
-		{
+		if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php")) {
 			$this->error = 'ErrorSetupNotComplete';
 			return -1;
 		}
@@ -1161,25 +1147,26 @@ class SupplierProposal extends CommonObject
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Hook of thirdparty module
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('objFrom'=>$objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 		}
 
 		unset($this->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -1221,15 +1208,16 @@ class SupplierProposal extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
 		$sql .= " WHERE p.fk_statut = c.id";
 		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
-		if ($ref) $sql .= " AND p.ref='".$ref."'";
-		else $sql .= " AND p.rowid=".$rowid;
+		if ($ref) {
+			$sql .= " AND p.ref='".$ref."'";
+		} else {
+			$sql .= " AND p.rowid=".$rowid;
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id                   = $obj->rowid;
@@ -1284,8 +1272,7 @@ class SupplierProposal extends CommonObject
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-				if ($obj->fk_statut == 0)
-				{
+				if ($obj->fk_statut == 0) {
 					$this->brouillon = 1;
 				}
 
@@ -1309,13 +1296,11 @@ class SupplierProposal extends CommonObject
 				$sql .= " ORDER by d.rang";
 
 				$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 SupplierProposalLine($this->db);
@@ -1411,8 +1396,7 @@ class SupplierProposal extends CommonObject
 		$now = dol_now();
 
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))
-		   || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))
-		{
+		   || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance))) {
 			$this->db->begin();
 
 			// Numbering module definition
@@ -1420,8 +1404,7 @@ class SupplierProposal extends CommonObject
 			$soc->fetch($this->socid);
 
 			// Define new ref
-			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-			{
+			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
 				$num = $this->getNextNumRef($soc);
 			} else {
 				$num = $this->ref;
@@ -1435,49 +1418,46 @@ class SupplierProposal extends CommonObject
 
 			dol_syslog(get_class($this)."::valid", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				dol_print_error($this->db);
 				$error++;
 			}
 
 			   // Trigger calls
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('PROPOSAL_SUPPLIER_VALIDATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
-				if (preg_match('/^[\(]?PROV/i', $this->ref))
-				{
+				if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 					// Now we rename also files into index
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'supplier_proposal/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'supplier_proposal/".$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->supplier_proposal->dir_output.'/'.$oldref;
 					$dirdest = $conf->supplier_proposal->dir_output.'/'.$newref;
-					if (!$error && file_exists($dirsource))
-					{
+					if (!$error && file_exists($dirsource)) {
 						dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
-						if (@rename($dirsource, $dirdest))
-						{
+						if (@rename($dirsource, $dirdest)) {
 							dol_syslog("Rename ok");
 							// Rename docs starting with $oldref with $newref
 							$listoffiles = dol_dir_list($conf->supplier_proposal->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;
@@ -1530,14 +1510,12 @@ class SupplierProposal extends CommonObject
 	 */
 	public function setDeliveryDate($user, $delivery_date)
 	{
-		if (!empty($user->rights->supplier_proposal->creer))
-		{
+		if (!empty($user->rights->supplier_proposal->creer)) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
 			$sql .= " SET date_livraison = ".($delivery_date != '' ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->date_livraison = $delivery_date;
 				$this->delivery_date = $delivery_date;
 				return 1;
@@ -1562,15 +1540,13 @@ class SupplierProposal extends CommonObject
 		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
-		if (!empty($user->rights->supplier_proposal->creer))
-		{
+		if (!empty($user->rights->supplier_proposal->creer)) {
 			$remise = price2num($remise);
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET remise_percent = ".$remise;
 			$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->remise_percent = $remise;
 				$this->update_price(1);
 				return 1;
@@ -1595,16 +1571,14 @@ class SupplierProposal extends CommonObject
 		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
-		if (!empty($user->rights->supplier_proposal->creer))
-		{
+		if (!empty($user->rights->supplier_proposal->creer)) {
 			$remise = price2num($remise);
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
 			$sql .= " SET remise_absolue = ".$remise;
 			$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->remise_absolue = $remise;
 				$this->update_price(1);
 				return 1;
@@ -1635,7 +1609,9 @@ class SupplierProposal extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
 		$sql .= " SET fk_statut = ".$this->statut.",";
-		if (!empty($note)) $sql .= " note_private = '".$this->db->escape($note)."',";
+		if (!empty($note)) {
+			$sql .= " note_private = '".$this->db->escape($note)."',";
+		}
 		$sql .= " date_cloture=NULL, fk_user_cloture=NULL";
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -1646,24 +1622,21 @@ class SupplierProposal extends CommonObject
 		if (!$resql) {
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
 		}
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('PROPOSAL_SUPPLIER_REOPEN', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			if (!empty($this->errors))
-			{
-				foreach ($this->errors as $errmsg)
-				{
+		if ($error) {
+			if (!empty($this->errors)) {
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -1700,28 +1673,23 @@ class SupplierProposal extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : (empty($this->model_pdf) ? '' : $this->model_pdf);
 			$triggerName = 'PROPOSAL_SUPPLIER_CLOSE_REFUSED';
 
-			if ($status == 2)
-			{
+			if ($status == 2) {
 				$triggerName = 'PROPOSAL_SUPPLIER_CLOSE_SIGNED';
 				$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : (empty($this->model_pdf) ? '' : $this->model_pdf);
 
-				if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
-				{
+				if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) {     // TODO This option was not tested correctly. Error if product ref does not exists
 					$result = $this->updateOrCreatePriceFournisseur($user);
 				}
 			}
-			if ($status == 4)
-			{
+			if ($status == 4) {
 				$triggerName = 'PROPOSAL_SUPPLIER_CLASSIFY_BILLED';
 			}
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				// Define output language
 				$outputlangs = $langs;
 				if (!empty($conf->global->MAIN_MULTILANGS)) {
@@ -1735,11 +1703,12 @@ class SupplierProposal 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 1;
 			} else {
@@ -1765,19 +1734,26 @@ class SupplierProposal extends CommonObject
 		global $conf;
 
 		dol_syslog(get_class($this)."::updateOrCreatePriceFournisseur", LOG_DEBUG);
-		foreach ($this->lines as $product)
-		{
-			if ($product->subprice <= 0) continue;
+		foreach ($this->lines as $product) {
+			if ($product->subprice <= 0) {
+				continue;
+			}
 			$productsupplier = new ProductFournisseur($this->db);
 
 			$multicurrency_tx = 1;
 			$fk_multicurrency = 0;
 
-			if (empty($this->thirdparty)) $this->fetch_thirdparty();
+			if (empty($this->thirdparty)) {
+				$this->fetch_thirdparty();
+			}
 
 			$ref_fourn = $product->ref_fourn;
-			if (empty($ref_fourn)) $ref_fourn = $product->ref_supplier;
-			if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) list($fk_multicurrency, $multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $product->multicurrency_code);
+			if (empty($ref_fourn)) {
+				$ref_fourn = $product->ref_supplier;
+			}
+			if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) {
+				list($fk_multicurrency, $multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $product->multicurrency_code);
+			}
 			$productsupplier->id = $product->fk_product;
 
 			$productsupplier->update_buyprice($product->qty, $product->total_ht, $user, 'HT', $this->thirdparty, '', $ref_fourn, $product->tva_tx, 0, 0, 0, $product->info_bits, '', '', array(), '', $product->multicurrency_total_ht, 'HT', $multicurrency_tx, $product->multicurrency_code, '', '', '');
@@ -1849,14 +1825,18 @@ class SupplierProposal extends CommonObject
 					$values[] = $product->multicurrency_total_ht;
 					$values[] = $multicurrency->rate->rate;
 				} else {
-					for ($i = 0; $i < 5; $i++) $values[] = 'NULL';
+					for ($i = 0; $i < 5; $i++) {
+						$values[] = 'NULL';
+					}
 				}
 			}
 		}
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price ';
 		$sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user';
-		if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) $sql .= ',fk_multicurrency, multicurrency_code, multicurrency_unitprice, multicurrency_price, multicurrency_tx';
+		if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) {
+			$sql .= ',fk_multicurrency, multicurrency_code, multicurrency_unitprice, multicurrency_price, multicurrency_tx';
+		}
 		$sql .= ')  VALUES ('.implode(',', $values).')';
 
 		$resql = $this->db->query($sql);
@@ -1881,8 +1861,7 @@ class SupplierProposal extends CommonObject
 
 		$error = 0;
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			dol_syslog(get_class($this)."::setDraft already draft status", LOG_WARNING);
 			return 0;
 		}
@@ -1891,8 +1870,7 @@ class SupplierProposal extends CommonObject
 		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
 		$sql .= " WHERE rowid = ".$this->id;
 
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			if (!$error) {
 				$this->oldcopy = clone $this;
 			}
@@ -1900,7 +1878,9 @@ class SupplierProposal extends CommonObject
 			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('PROPOSAL_SUPPLIER_UNVALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (!$error) {
@@ -1942,38 +1922,42 @@ class SupplierProposal extends CommonObject
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
 		$sql .= " p.datep as dp, p.fin_validite as datelimite";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", sc.fk_soc, sc.fk_user";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE p.entity IN (".getEntity('supplier_proposal').")";
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.fk_statut = c.id";
-		if (!$user->rights->societe->client->voir && !$socid) //restriction
-		{
+		if (!$user->rights->societe->client->voir && !$socid) { //restriction
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
-		if ($socid) $sql .= " AND s.rowid = ".$socid;
-		if ($draft)	$sql .= " AND p.fk_statut = 0";
-		if ($notcurrentuser > 0) $sql .= " AND p.fk_user_author <> ".$user->id;
+		if ($socid) {
+			$sql .= " AND s.rowid = ".$socid;
+		}
+		if ($draft) {
+			$sql .= " AND p.fk_statut = 0";
+		}
+		if ($notcurrentuser > 0) {
+			$sql .= " AND p.fk_user_author <> ".$user->id;
+		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		$sql .= $this->db->plimit($limit, $offset);
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
-			if ($num)
-			{
+			if ($num) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
 
-					if ($shortlist == 1)
-					{
+					if ($shortlist == 1) {
 						$ga[$obj->supplier_proposalid] = $obj->ref;
-					} elseif ($shortlist == 2)
-					{
+					} elseif ($shortlist == 2) {
 						$ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
 					} else {
 						$ga[$i]['id'] = $obj->supplier_proposalid;
@@ -2007,57 +1991,51 @@ class SupplierProposal extends CommonObject
 
 		$this->db->begin();
 
-		if (!$notrigger)
-		{
+		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PROPOSAL_SUPPLIER_DELETE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$main = MAIN_DB_PREFIX.'supplier_proposaldet';
 			$ef = $main."_extrafields";
 			$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_supplier_proposal = ".$this->id.")";
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal = ".$this->id;
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposal WHERE rowid = ".$this->id;
-				if ($this->db->query($sqlef) && $this->db->query($sql))
-				{
+				if ($this->db->query($sqlef) && $this->db->query($sql)) {
 					// Delete linked object
 					$res = $this->deleteObjectLinked();
-					if ($res < 0) $error++;
+					if ($res < 0) {
+						$error++;
+					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
 						$this->deleteEcmFiles();
 
 						// We remove directory
 						$ref = dol_sanitizeFileName($this->ref);
-						if ($conf->supplier_proposal->dir_output && !empty($this->ref))
-						{
+						if ($conf->supplier_proposal->dir_output && !empty($this->ref)) {
 							$dir = $conf->supplier_proposal->dir_output."/".$ref;
 							$file = $dir."/".$ref.".pdf";
-							if (file_exists($file))
-							{
+							if (file_exists($file)) {
 								dol_delete_preview($this);
 
-								if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-								{
+								if (!dol_delete_file($file, 0, 0, 0, $this)) { // For triggers
 									$this->error = 'ErrorFailToDeleteFile';
 									$this->errors = array('ErrorFailToDeleteFile');
 									$this->db->rollback();
 									return 0;
 								}
 							}
-							if (file_exists($dir))
-							{
+							if (file_exists($dir)) {
 								$res = @dol_delete_dir_recursive($dir);
-								if (!$res)
-								{
+								if (!$res) {
 									$this->error = 'ErrorFailToDeleteDir';
 									$this->errors = array('ErrorFailToDeleteDir');
 									$this->db->rollback();
@@ -2068,19 +2046,16 @@ class SupplierProposal extends CommonObject
 					}
 
 					// Removed extrafields
-					if (!$error)
-					{
+					if (!$error) {
 						$result = $this->deleteExtraFields();
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							$errorflag = -4;
 							dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
 						}
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
 						$this->db->commit();
 						return 1;
@@ -2121,10 +2096,8 @@ class SupplierProposal extends CommonObject
 
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id                = $obj->rowid;
@@ -2137,15 +2110,13 @@ class SupplierProposal extends CommonObject
 				$cuser->fetch($obj->fk_user_author);
 				$this->user_creation = $cuser;
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
@@ -2182,8 +2153,7 @@ class SupplierProposal extends CommonObject
 		// phpcs:enable
 
 		// Init/load array of translation of status
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			$langs->load("supplier_proposal");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv("SupplierProposalStatusDraft");
@@ -2199,11 +2169,17 @@ class SupplierProposal extends CommonObject
 		}
 
 		$statusnew = '';
-		if ($status == self::STATUS_DRAFT) $statusnew = 'status0';
-		elseif ($status == self::STATUS_VALIDATED) $statusnew = 'status1';
-		elseif ($status == self::STATUS_SIGNED) $statusnew = 'status4';
-		elseif ($status == self::STATUS_NOTSIGNED) $statusnew = 'status9';
-		elseif ($status == self::STATUS_CLOSE) $statusnew = 'status6';
+		if ($status == self::STATUS_DRAFT) {
+			$statusnew = 'status0';
+		} elseif ($status == self::STATUS_VALIDATED) {
+			$statusnew = 'status1';
+		} elseif ($status == self::STATUS_SIGNED) {
+			$statusnew = 'status4';
+		} elseif ($status == self::STATUS_NOTSIGNED) {
+			$statusnew = 'status9';
+		} elseif ($status == self::STATUS_CLOSE) {
+			$statusnew = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusnew, $mode);
 	}
@@ -2229,20 +2205,24 @@ class SupplierProposal extends CommonObject
 
 		$sql = "SELECT p.rowid, p.ref, p.datec as datec";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = " AND";
 		}
 		$sql .= $clause." p.entity IN (".getEntity('supplier_proposal').")";
-		if ($mode == 'opened') $sql .= " AND p.fk_statut = 1";
-		if ($mode == 'signed') $sql .= " AND p.fk_statut = 2";
-		if ($user->socid) $sql .= " AND p.fk_soc = ".$user->socid;
+		if ($mode == 'opened') {
+			$sql .= " AND p.fk_statut = 1";
+		}
+		if ($mode == 'signed') {
+			$sql .= " AND p.fk_statut = 2";
+		}
+		if ($user->socid) {
+			$sql .= " AND p.fk_soc = ".$user->socid;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$label = $labelShort = '';
 			$status = '';
 			if ($mode == 'opened') {
@@ -2266,14 +2246,11 @@ class SupplierProposal extends CommonObject
 			$response->img = img_object('', "propal");
 
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
-				if ($mode == 'opened')
-				{
+				if ($mode == 'opened') {
 					$datelimit = $this->db->jdate($obj->datefin);
-					if ($datelimit < ($now - $delay_warning))
-					{
+					if ($datelimit < ($now - $delay_warning)) {
 						$response->nbtodolate++;
 					}
 				}
@@ -2308,12 +2285,10 @@ class SupplierProposal extends CommonObject
 		$sql .= $this->db->plimit(100);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_prods = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_prods)
-			{
+			while ($i < $num_prods) {
 				$i++;
 				$row = $this->db->fetch_row($resql);
 				$prodids[$i] = $row[0];
@@ -2335,8 +2310,7 @@ class SupplierProposal extends CommonObject
 		// Lines
 		$nbp = 5;
 		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
+		while ($xnbp < $nbp) {
 			$line = new SupplierProposalLine($this->db);
 			$line->desc = $langs->trans("Description")." ".$xnbp;
 			$line->qty = 1;
@@ -2344,8 +2318,7 @@ class SupplierProposal extends CommonObject
 			$line->tva_tx = 19.6;
 			$line->localtax1_tx = 0;
 			$line->localtax2_tx = 0;
-			if ($xnbp == 2)
-			{
+			if ($xnbp == 2) {
 				$line->total_ht = 50;
 				$line->total_ttc = 59.8;
 				$line->total_tva = 9.8;
@@ -2357,8 +2330,7 @@ class SupplierProposal extends CommonObject
 				$line->remise_percent = 00;
 			}
 
-			if ($num_prods > 0)
-			{
+			if ($num_prods > 0) {
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product = $prodids[$prodid];
 			}
@@ -2390,8 +2362,7 @@ class SupplierProposal extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
@@ -2399,11 +2370,9 @@ class SupplierProposal extends CommonObject
 		$sql .= " ".$clause." p.entity IN (".getEntity('supplier_proposal').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["supplier_proposals"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -2428,8 +2397,7 @@ class SupplierProposal extends CommonObject
 		global $conf, $db, $langs;
 		$langs->load("supplier_proposal");
 
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
-		{
+		if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON)) {
 			$mybool = false;
 
 			$file = $conf->global->SUPPLIER_PROPOSAL_ADDON.".php";
@@ -2444,8 +2412,7 @@ class SupplierProposal extends CommonObject
 				$mybool |= @include_once $dir.$file;
 			}
 
-			if (!$mybool)
-			{
+			if (!$mybool) {
 				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
@@ -2454,8 +2421,7 @@ class SupplierProposal extends CommonObject
 			$numref = "";
 			$numref = $obj->getNextValue($soc, $this);
 
-			if ($numref != "")
-			{
+			if ($numref != "") {
 				return $numref;
 			} else {
 				$this->error = $obj->error;
@@ -2483,7 +2449,9 @@ class SupplierProposal extends CommonObject
 	{
 		global $langs, $conf, $user;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$url = '';
 		$result = '';
@@ -2492,11 +2460,21 @@ class SupplierProposal extends CommonObject
 		if (isset($this->status)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}
-		if (!empty($this->ref)) $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->ref_fourn)) $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
-		if (!empty($this->total_ht)) $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_tva)) $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_ttc)) $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+		if (!empty($this->ref)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		}
+		if (!empty($this->ref_fourn)) {
+			$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
+		}
+		if (!empty($this->total_ht)) {
+			$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+		}
+		if (!empty($this->total_tva)) {
+			$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+		}
+		if (!empty($this->total_ttc)) {
+			$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+		}
 
 		if ($option == '') {
 			$url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id.$get_params;
@@ -2505,19 +2483,20 @@ class SupplierProposal extends CommonObject
 			$url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id.$get_params;
 		}
 
-		if ($option !== 'nolink')
-		{
+		if ($option !== 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip) && $user->rights->propal->lire)
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip) && $user->rights->propal->lire) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowSupplierProposal");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -2530,15 +2509,17 @@ class SupplierProposal extends CommonObject
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
-		if ($addlinktonotes)
-		{
+		if ($addlinktonotes) {
 			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-			if ($txttoshow)
-			{
+			if ($txttoshow) {
 				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
 				$result .= ' <span class="note inline-block">';
 				$result .= '<a href="'.DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
@@ -2576,13 +2557,11 @@ class SupplierProposal extends CommonObject
 
 		dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->lines[$i] = new SupplierProposalLine($this->db);
@@ -2876,8 +2855,7 @@ class SupplierProposalLine extends CommonObjectLine
 		$sql .= ' WHERE pd.rowid = '.$rowid;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$objp = $this->db->fetch_object($result);
 
 			$this->id = $objp->rowid;
@@ -2948,30 +2926,62 @@ class SupplierProposalLine extends CommonObjectLine
 		dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
 		// Clean parameters
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->rang)) $this->rang = 0;
-		if (empty($this->remise)) $this->remise = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
-		if (empty($this->fk_unit)) $this->fk_unit = 0;
-		if (empty($this->subprice)) $this->subprice = 0;
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->rang)) {
+			$this->rang = 0;
+		}
+		if (empty($this->remise)) {
+			$this->remise = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (empty($this->fk_fournprice)) {
+			$this->fk_fournprice = 0;
+		}
+		if (empty($this->fk_unit)) {
+			$this->fk_unit = 0;
+		}
+		if (empty($this->subprice)) {
+			$this->subprice = 0;
+		}
 
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0)
-		{
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-			{
+		if ($this->pa_ht == 0) {
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -2979,7 +2989,9 @@ class SupplierProposalLine extends CommonObjectLine
 		}
 
 		// Check parameters
-		if ($this->product_type < 0) return -1;
+		if ($this->product_type < 0) {
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -3032,25 +3044,20 @@ class SupplierProposalLine extends CommonObjectLine
 
 		dol_syslog(get_class($this).'::insert', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
 
-			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('LINESUPPLIER_PROPOSAL_INSERT', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
 				}
@@ -3080,14 +3087,11 @@ class SupplierProposalLine extends CommonObjectLine
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".$this->id;
 		dol_syslog("SupplierProposalLine::delete", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			// 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);
 				}
@@ -3095,8 +3099,7 @@ class SupplierProposalLine extends CommonObjectLine
 
 			// Call trigger
 			$result = $this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE', $user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				return -1;
 			}
@@ -3125,30 +3128,62 @@ class SupplierProposalLine extends CommonObjectLine
 		$error = 0;
 
 		// Clean parameters
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->marque_tx)) $this->marque_tx = 0;
-		if (empty($this->marge_tx)) $this->marge_tx = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
-		if (empty($this->fk_unit)) $this->fk_unit = 0;
-		if (empty($this->subprice)) $this->subprice = 0;
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->marque_tx)) {
+			$this->marque_tx = 0;
+		}
+		if (empty($this->marge_tx)) {
+			$this->marge_tx = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (empty($this->fk_fournprice)) {
+			$this->fk_fournprice = 0;
+		}
+		if (empty($this->fk_unit)) {
+			$this->fk_unit = 0;
+		}
+		if (empty($this->subprice)) {
+			$this->subprice = 0;
+		}
 
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0)
-		{
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-			{
+		if ($this->pa_ht == 0) {
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -3173,8 +3208,7 @@ class SupplierProposalLine extends CommonObjectLine
 		$sql .= " , subprice=".price2num($this->subprice)."";
 		$sql .= " , remise_percent=".price2num($this->remise_percent)."";
 		$sql .= " , info_bits='".$this->db->escape($this->info_bits)."'";
-		if (empty($this->skip_update_total))
-		{
+		if (empty($this->skip_update_total)) {
 			$sql .= " , total_ht=".price2num($this->total_ht)."";
 			$sql .= " , total_tva=".price2num($this->total_tva)."";
 			$sql .= " , total_ttc=".price2num($this->total_ttc)."";
@@ -3183,9 +3217,13 @@ class SupplierProposalLine extends CommonObjectLine
 		}
 		$sql .= " , fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
 		$sql .= " , buy_price_ht=".price2num($this->pa_ht);
-		if (strlen($this->special_code)) $sql .= " , special_code=".$this->special_code;
+		if (strlen($this->special_code)) {
+			$sql .= " , special_code=".$this->special_code;
+		}
 		$sql .= " , fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
-		if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+		if (!empty($this->rang)) {
+			$sql .= ", rang=".$this->rang;
+		}
 		$sql .= " , ref_fourn=".(!empty($this->ref_fourn) ? "'".$this->db->escape($this->ref_fourn)."'" : "null");
 		$sql .= " , fk_unit=".($this->fk_unit ? $this->fk_unit : 'null');
 
@@ -3199,23 +3237,18 @@ class SupplierProposalLine extends CommonObjectLine
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$error)
-			{
+		if ($resql) {
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
 				}
@@ -3253,8 +3286,7 @@ class SupplierProposalLine extends CommonObjectLine
 		dol_syslog("SupplierProposalLine::update_total", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->db->commit();
 			return 1;
 		} else {
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index ce76b9d8bf7..527ba87cb3e 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -39,7 +39,9 @@ $ref	= GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal', '');
 
 $object = new SupplierProposal($db);
@@ -51,50 +53,38 @@ $permissiontoedit = $user->rights->supplier_proposal->creer;
  * Add a new contact
  */
 
-if ($action == 'addcontact' && $permissiontoedit)
-{
+if ($action == 'addcontact' && $permissiontoedit) {
 	$result = $object->fetch($id);
 
-	if ($result > 0 && $id > 0)
-	{
+	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
 	}
 
-	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' && $permissiontoedit)
-{
-	if ($object->fetch($id))
-	{
+} elseif ($action == 'swapstatut' && $permissiontoedit) {
+	// Toggle the status of a contact
+	if ($object->fetch($id)) {
 		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
-}
-
-// Deleting a contact
-elseif ($action == 'deletecontact' && $permissiontoedit)
-{
+} elseif ($action == 'deletecontact' && $permissiontoedit) {
+	// Deleting a contact
 	$object->fetch($id);
 	$result = $object->delete_contact(GETPOST("lineid", 'int'));
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -123,12 +113,10 @@ $userstatic = new User($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$langs->trans("SupplierProposal");
 
-	if ($object->fetch($id, $ref) > 0)
-	{
+	if ($object->fetch($id, $ref) > 0) {
 		$object->fetch_thirdparty();
 
 		$head = supplier_proposal_prepare_head($object);
@@ -145,12 +133,10 @@ if ($id > 0 || !empty($ref))
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($permissiontoedit)
-			{
+			if ($permissiontoedit) {
 				if ($action != 'classify') {
 					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 09fb48ab1fb..11fb3149aff 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -45,8 +45,7 @@ $ref		= GETPOST('ref', 'alpha');
 
 // Security check
 $socid = '';
-if (!empty($user->socid))
-{
+if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'supplier_proposal', $id);
@@ -56,17 +55,22 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new SupplierProposal($db);
 $object->fetch($id, $ref);
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref);
 	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
@@ -81,8 +85,7 @@ llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 	$head = supplier_proposal_prepare_head($object);
@@ -91,8 +94,7 @@ if ($object->id > 0)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
@@ -108,12 +110,10 @@ if ($object->id > 0)
 	// 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->supplier_proposal->creer)
-		{
+		if ($user->rights->supplier_proposal->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index fd3dccce0bb..0982abe467d 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -38,8 +38,7 @@ $langs->loadLangs(array('supplier_proposal', 'companies'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -65,8 +64,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // Search form
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	print '<form method="post" action="'.DOL_URL_ROOT.'/supplier_proposal/list.php">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<div class="div-table-responsive-no-min">';
@@ -84,16 +82,21 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
 $sql = "SELECT count(p.rowid), p.fk_statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE p.fk_soc = s.rowid";
 $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
-if ($user->socid) $sql .= ' AND p.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 p.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 .= " AND p.fk_statut IN (0,1,2,3,4)";
 $sql .= " GROUP BY p.fk_statut";
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -103,11 +106,9 @@ if ($resql)
 	$colorseries = array();
 	$vals = array();
 	// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
-		if ($row)
-		{
+		if ($row) {
 			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
 			{
 				$vals[$row[1]] = $row[0];
@@ -125,25 +126,32 @@ if ($resql)
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</th></tr>'."\n";
 	$listofstatus = array(0, 1, 2, 3, 4);
-	foreach ($listofstatus as $status)
-	{
+	foreach ($listofstatus as $status) {
 		$dataseries[] = array($supplier_proposalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-		if ($status == SupplierProposal::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-		if ($status == SupplierProposal::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-		if ($status == SupplierProposal::STATUS_SIGNED) $colorseries[$status] = $badgeStatus4;
-		if ($status == SupplierProposal::STATUS_NOTSIGNED) $colorseries[$status] = $badgeStatus9;
-		if ($status == SupplierProposal::STATUS_CLOSE) $colorseries[$status] = $badgeStatus6;
+		if ($status == SupplierProposal::STATUS_DRAFT) {
+			$colorseries[$status] = '-'.$badgeStatus0;
+		}
+		if ($status == SupplierProposal::STATUS_VALIDATED) {
+			$colorseries[$status] = $badgeStatus1;
+		}
+		if ($status == SupplierProposal::STATUS_SIGNED) {
+			$colorseries[$status] = $badgeStatus4;
+		}
+		if ($status == SupplierProposal::STATUS_NOTSIGNED) {
+			$colorseries[$status] = $badgeStatus9;
+		}
+		if ($status == SupplierProposal::STATUS_CLOSE) {
+			$colorseries[$status] = $badgeStatus6;
+		}
 
-		if (empty($conf->use_javascript_ajax))
-		{
+		if (empty($conf->use_javascript_ajax)) {
 			print '<tr class="oddeven">';
 			print '<td>'.$supplier_proposalstatic->LibStatut($status, 0).'</td>';
 			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
 			print "</tr>\n";
 		}
 	}
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		print '<tr><td class="center" colspan="2">';
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -170,32 +178,34 @@ if ($resql)
 /*
  * Draft askprice
  */
-if (!empty($conf->supplier_proposal->enabled))
-{
+if (!empty($conf->supplier_proposal->enabled)) {
 	$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity = ".$conf->entity;
 	$sql .= " AND c.fk_statut = 0";
-	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND c.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("DraftRequests").'</th></tr>';
 		$langs->load("supplier_proposal");
 		$num = $db->num_rows($resql);
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
@@ -230,29 +240,32 @@ $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid,
 $sql .= " date_cloture as datec";
 $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity = ".$conf->entity;
 //$sql.= " AND c.fk_statut > 2";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid) {
+	$sql .= " AND c.fk_soc = ".$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 $sql .= " ORDER BY c.tms DESC";
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastModifiedRequests", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -292,14 +305,15 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 
 /*
  * Opened askprice
  */
-if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-{
+if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
 	$langs->load("supplier_proposal");
 
 	$now = dol_now();
@@ -307,29 +321,32 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client, p.rowid as supplier_proposalid, p.total_ttc, p.total_tva, p.total_ht, p.ref, p.fk_statut, p.datec as dp";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."supplier_proposal as p";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE p.fk_soc = s.rowid";
 	$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
 	$sql .= " AND p.fk_statut = 1";
-	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 p.rowid DESC";
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$total = 0;
 		$num = $db->num_rows($result);
 		$i = 0;
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th></tr>';
 
 			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-			{
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($result);
 
 				print '<tr class="oddeven">';
@@ -345,7 +362,9 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 				print $supplier_proposalstatic->getNomUrl(1);
 				print '</td>';
 				print '<td width="18" class="nobordernopadding nowrap">';
-				if ($db->jdate($obj->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
+				if ($db->jdate($obj->dfv) < ($now - $conf->supplier_proposal->cloture->warning_delay)) {
+					print img_warning($langs->trans("Late"));
+				}
 				print '</td>';
 				print '<td width="16" class="center nobordernopadding">';
 				$filename = dol_sanitizeFileName($obj->ref);
@@ -370,11 +389,9 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 				$i++;
 				$total += $obj->total_ttc;
 			}
-			if ($num > $nbofloop)
-			{
+			if ($num > $nbofloop) {
 				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			} elseif ($total > 0)
-			{
+			} elseif ($total > 0) {
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table></div><br>";
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index dbff367b7c8..77268671275 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -39,7 +39,9 @@ $id = GETPOST('id', 'int');
 $socid = GETPOST('socid', 'int');
 
 // Security check
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'supplier_proposal', $id);
 
 
@@ -72,12 +74,10 @@ $morehtmlref = '<div class="refidno">';
 // Thirdparty
 $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	if ($user->rights->supplier_proposal->creer)
-	{
+	if ($user->rights->supplier_proposal->creer) {
 		if ($action != 'classify') {
 			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 04bafe19297..208c8242ab4 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -40,8 +40,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-if (!empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'supplier_proposal', 'compta', 'bills', 'orders', 'products'));
@@ -93,14 +94,22 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'sp.date_livraison';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 'sp.date_livraison';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
-if ($object_statut != '') $search_status = $object_statut;
+if ($object_statut != '') {
+	$search_status = $object_statut;
+}
 
 // Nombre de ligne pour choix de produit/service predefinis
 $NBLINES = 4;
@@ -109,9 +118,10 @@ $NBLINES = 4;
 $module = 'supplier_proposal';
 $dbtable = '';
 $objectid = '';
-if (!empty($user->socid))	$socid = $user->socid;
-if (!empty($socid))
-{
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
+if (!empty($socid)) {
 	$objectid = $socid;
 	$module = 'societe';
 	$dbtable = '&societe';
@@ -138,7 +148,9 @@ $fieldstosearchall = array(
 	'pd.description'=>'Description',
 	'sp.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["p.note_private"] = "NotePrivate";
+if (empty($user->socid)) {
+	$fieldstosearchall["p.note_private"] = "NotePrivate";
+}
 
 $checkedtypetiers = 0;
 $arrayfields = array(
@@ -176,18 +188,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.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 	$search_categ = '';
 	$search_user = '';
 	$search_sale = '';
@@ -219,8 +236,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$object_statut = '';
 }
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$objectclass = 'SupplierProposal';
 	$objectlabel = 'SupplierProposals';
 	$permissiontoread = $user->rights->supplier_proposal->lire;
@@ -249,7 +265,9 @@ $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
 //llxHeader('',$langs->trans('CommRequest'),$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0 || $search_user > 0) {
+	$sql = 'SELECT DISTINCT';
+}
 $sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -257,11 +275,15 @@ $sql .= ' sp.rowid, sp.note_private, sp.total_ht, sp.total_tva, sp.total_ttc, sp
 $sql .= ' sp.fk_multicurrency, sp.multicurrency_code, sp.multicurrency_tx, sp.multicurrency_total_ht, sp.multicurrency_total_tva as multicurrency_total_vat, sp.multicurrency_total_ttc,';
 $sql .= ' sp.datec as date_creation, sp.tms as date_update,';
 $sql .= " p.rowid as project_id, p.ref as project_ref,";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " sc.fk_soc, sc.fk_user,";
+}
 $sql .= " u.firstname, u.lastname, u.photo, u.login";
 // 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();
@@ -272,48 +294,93 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= ', '.MAIN_DB_PREFIX.'supplier_proposal as sp';
-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 (sp.rowid = ef.fk_object)";
-if ($sall || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'supplier_proposaldet as pd ON sp.rowid=pd.fk_supplier_proposal';
-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 (sp.rowid = ef.fk_object)";
+}
+if ($sall || $search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'supplier_proposaldet as pd ON sp.rowid=pd.fk_supplier_proposal';
+}
+if ($search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+}
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON sp.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = sp.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-if ($search_user > 0)
-{
+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as c";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql .= ' WHERE sp.fk_soc = s.rowid';
 $sql .= ' AND sp.entity IN ('.getEntity('supplier_proposal').')';
-if (!$user->rights->societe->client->voir && !$socid) //restriction
-{
+if (!$user->rights->societe->client->voir && !$socid) { //restriction
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
-if ($search_town)  $sql .= natural_search('s.town', $search_town);
-if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
-if ($search_state) $sql .= natural_search("state.nom", $search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-if ($search_ref)     $sql .= natural_search('sp.ref', $search_ref);
-if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($search_login)  $sql .= natural_search('u.login', $search_login);
-if ($search_montant_ht) $sql .= natural_search('sp.total_ht=', $search_montant_ht, 1);
-if ($search_montant_vat != '') $sql .= natural_search("sp.total_tva", $search_montant_vat, 1);
-if ($search_montant_ttc != '') $sql .= natural_search("sp.total_ttc", $search_montant_ttc, 1);
-if ($search_multicurrency_code != '')        $sql .= ' AND sp.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
-if ($search_multicurrency_tx != '')          $sql .= natural_search('sp.multicurrency_tx', $search_multicurrency_tx, 1);
-if ($search_multicurrency_montant_ht != '')  $sql .= natural_search('sp.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
-if ($search_multicurrency_montant_vat != '') $sql .= natural_search('sp.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
-if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('sp.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($socid) $sql .= ' AND s.rowid = '.$socid;
-if ($search_status >= 0 && $search_status != '') $sql .= ' AND sp.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
+if ($search_town) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+	$sql .= natural_search("s.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_country) {
+	$sql .= " AND s.fk_pays IN (".$search_country.')';
+}
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
+	$sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+}
+if ($search_ref) {
+	$sql .= natural_search('sp.ref', $search_ref);
+}
+if ($search_societe) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if ($search_login) {
+	$sql .= natural_search('u.login', $search_login);
+}
+if ($search_montant_ht) {
+	$sql .= natural_search('sp.total_ht=', $search_montant_ht, 1);
+}
+if ($search_montant_vat != '') {
+	$sql .= natural_search("sp.total_tva", $search_montant_vat, 1);
+}
+if ($search_montant_ttc != '') {
+	$sql .= natural_search("sp.total_ttc", $search_montant_ttc, 1);
+}
+if ($search_multicurrency_code != '') {
+	$sql .= ' AND sp.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+}
+if ($search_multicurrency_tx != '') {
+	$sql .= natural_search('sp.multicurrency_tx', $search_multicurrency_tx, 1);
+}
+if ($search_multicurrency_montant_ht != '') {
+	$sql .= natural_search('sp.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
+}
+if ($search_multicurrency_montant_vat != '') {
+	$sql .= natural_search('sp.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
+}
+if ($search_multicurrency_montant_ttc != '') {
+	$sql .= natural_search('sp.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+}
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if ($socid) {
+	$sql .= ' AND s.rowid = '.$socid;
+}
+if ($search_status >= 0 && $search_status != '') {
+	$sql .= ' AND sp.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
+}
 $sql .= dolSqlDateFilter("sp.date_livraison", $day, $month, $year);
 $sql .= dolSqlDateFilter("sp.date_valid", $dayvalid, $monthvalid, $yearvalid);
-if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
-if ($search_user > 0)
-{
+if ($search_sale > 0) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
+}
+if ($search_user > 0) {
 	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = sp.rowid AND c.fk_socpeople = ".$search_user;
 }
 // Add where from extra fields
@@ -328,12 +395,10 @@ $sql .= ', sp.ref DESC';
 
 // 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;
 	}
@@ -342,13 +407,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$objectstatic = new SupplierProposal($db);
 	$userstatic = new User($db);
 
-	if ($socid > 0)
-	{
+	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name;
@@ -360,8 +423,7 @@ if ($resql)
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-	{
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 		$obj = $db->fetch_object($resql);
 
 		$id = $obj->rowid;
@@ -374,28 +436,72 @@ if ($resql)
 	llxHeader('', $langs->trans('CommRequest'), $help_url);
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($sall)				 $param .= '&sall='.urlencode($sall);
-	if ($month)              $param .= '&month='.urlencode($month);
-	if ($year)               $param .= '&year='.urlencode($year);
-	if ($search_ref)         $param .= '&search_ref='.urlencode($search_ref);
-	if ($search_societe)     $param .= '&search_societe='.urlencode($search_societe);
-	if ($search_user > 0)    $param .= '&search_user='.urlencode($search_user);
-	if ($search_sale > 0)    $param .= '&search_sale='.urlencode($search_sale);
-	if ($search_montant_ht)  $param .= '&search_montant_ht='.urlencode($search_montant_ht);
-	if ($search_multicurrency_code != '')  $param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
-	if ($search_multicurrency_tx != '')  $param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
-	if ($search_multicurrency_montant_ht != '')  $param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
-	if ($search_multicurrency_montant_vat != '')  $param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
-	if ($search_multicurrency_montant_ttc != '') $param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
-	if ($search_login)  	 $param .= '&search_login='.urlencode($search_login);
-	if ($search_town)		 $param .= '&search_town='.urlencode($search_town);
-	if ($search_zip)		 $param .= '&search_zip='.urlencode($search_zip);
-	if ($socid > 0)          $param .= '&socid='.urlencode($socid);
-	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
-	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)   $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($sall) {
+		$param .= '&sall='.urlencode($sall);
+	}
+	if ($month) {
+		$param .= '&month='.urlencode($month);
+	}
+	if ($year) {
+		$param .= '&year='.urlencode($year);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_societe) {
+		$param .= '&search_societe='.urlencode($search_societe);
+	}
+	if ($search_user > 0) {
+		$param .= '&search_user='.urlencode($search_user);
+	}
+	if ($search_sale > 0) {
+		$param .= '&search_sale='.urlencode($search_sale);
+	}
+	if ($search_montant_ht) {
+		$param .= '&search_montant_ht='.urlencode($search_montant_ht);
+	}
+	if ($search_multicurrency_code != '') {
+		$param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
+	}
+	if ($search_multicurrency_tx != '') {
+		$param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
+	}
+	if ($search_multicurrency_montant_ht != '') {
+		$param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
+	}
+	if ($search_multicurrency_montant_vat != '') {
+		$param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
+	}
+	if ($search_multicurrency_montant_ttc != '') {
+		$param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
+	}
+	if ($search_login) {
+		$param .= '&search_login='.urlencode($search_login);
+	}
+	if ($search_town) {
+		$param .= '&search_town='.urlencode($search_town);
+	}
+	if ($search_zip) {
+		$param .= '&search_zip='.urlencode($search_zip);
+	}
+	if ($socid > 0) {
+		$param .= '&socid='.urlencode($socid);
+	}
+	if ($search_status != '') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
+	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
+		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	}
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -405,17 +511,25 @@ if ($resql)
 		'builddoc'=>$langs->trans("PDFMerge"),
 		//'presend'=>$langs->trans("SendByMail"),
 	);
-	if ($user->rights->supplier_proposal->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	if ($user->rights->supplier_proposal->supprimer) {
+		$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$url = DOL_URL_ROOT.'/supplier_proposal/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewAskPrice'), '', 'fa fa-plus-circle', $url, '', $user->rights->supplier_proposal->creer);
 
 	// Fields title search
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -430,9 +544,10 @@ if ($resql)
 	$trackid = 'spro'.$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>';
 	}
 
@@ -440,26 +555,23 @@ if ($resql)
 
 	$moreforfilter = '';
 
- 	// If the user can view prospects other than his'
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
- 		$langs->load("commercial");
-	 	$moreforfilter .= '<div class="divsearchfield">';
-	 	$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
-		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
-	 	$moreforfilter .= '</div>';
- 	}
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid)
-	{
+	if ($user->rights->societe->client->voir || $socid) {
+		$langs->load("commercial");
+		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
+		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth300');
+		$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, '', 'maxwidth300');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
@@ -469,11 +581,13 @@ if ($resql)
 	}
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-	else $moreforfilter = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$moreforfilter .= $hookmanager->resPrint;
+	} else {
+		$moreforfilter = $hookmanager->resPrint;
+	}
 
-	if (!empty($moreforfilter))
-	{
+	if (!empty($moreforfilter)) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
@@ -481,50 +595,50 @@ if ($resql)
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	if ($massactionbutton) {
+		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	}
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['sp.ref']['checked']))
-	{
+	if (!empty($arrayfields['sp.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>';
 	}
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre left">';
 		print '<input class="flat" type="text" size="12" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="liste_titre center">';
 		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 		print '</td>';
 	}
 	// Company type
-	if (!empty($arrayfields['typent.code']['checked']))
-	{
+	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date
-	if (!empty($arrayfields['sp.date_valid']['checked']))
-	{
+	if (!empty($arrayfields['sp.date_valid']['checked'])) {
 		print '<td class="liste_titre center">';
 		//print $langs->trans('Month').': ';
 		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="monthvalid" value="'.dol_escape_htmltag($monthvalid).'">';
@@ -534,8 +648,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date
-	if (!empty($arrayfields['sp.date_livraison']['checked']))
-	{
+	if (!empty($arrayfields['sp.date_livraison']['checked'])) {
 		print '<td class="liste_titre center">';
 		//print $langs->trans('Month').': ';
 		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
@@ -545,64 +658,55 @@ if ($resql)
 		print '</td>';
 	}
 
-	if (!empty($arrayfields['sp.total_ht']['checked']))
-	{
+	if (!empty($arrayfields['sp.total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['sp.total_tva']['checked']))
-	{
+	if (!empty($arrayfields['sp.total_tva']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['sp.total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['sp.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['sp.multicurrency_code']['checked']))
-	{
+	if (!empty($arrayfields['sp.multicurrency_code']['checked'])) {
 		// Currency
 		print '<td class="liste_titre">';
 		print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['sp.multicurrency_tx']['checked']))
-	{
+	if (!empty($arrayfields['sp.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['sp.multicurrency_total_ht']['checked']))
-	{
+	if (!empty($arrayfields['sp.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['sp.multicurrency_total_vat']['checked']))
-	{
+	if (!empty($arrayfields['sp.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['sp.multicurrency_total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['u.login']['checked']))
-	{
+	if (!empty($arrayfields['u.login']['checked'])) {
 		// Author
 		print '<td class="liste_titre center">';
 		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
@@ -615,20 +719,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['sp.datec']['checked']))
-	{
+	if (!empty($arrayfields['sp.datec']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['sp.tms']['checked']))
-	{
+	if (!empty($arrayfields['sp.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['sp.fk_statut']['checked']))
-	{
+	if (!empty($arrayfields['sp.fk_statut']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone right">';
 		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status');
 		print '</td>';
@@ -643,33 +744,75 @@ if ($resql)
 
 	// Fields title
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['sp.ref']['checked']))           print_liste_field_titre($arrayfields['sp.ref']['label'], $_SERVER["PHP_SELF"], 'sp.ref', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['state.nom']['checked']))        print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['sp.date_valid']['checked']))      print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['sp.date_livraison']['checked']))  print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['sp.total_ht']['checked']))        print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['sp.total_tva']['checked']))       print_liste_field_titre($arrayfields['sp.total_tva']['label'], $_SERVER["PHP_SELF"], 'sp.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['sp.total_ttc']['checked']))       print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['sp.multicurrency_code']['checked']))      print_liste_field_titre($arrayfields['sp.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_code', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['sp.multicurrency_tx']['checked']))        print_liste_field_titre($arrayfields['sp.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['sp.multicurrency_total_ht']['checked']))  print_liste_field_titre($arrayfields['sp.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['sp.multicurrency_total_vat']['checked'])) print_liste_field_titre($arrayfields['sp.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) print_liste_field_titre($arrayfields['sp.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['u.login']['checked']))            print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['sp.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.ref']['label'], $_SERVER["PHP_SELF"], 'sp.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['state.nom']['checked'])) {
+		print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
+		print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['typent.code']['checked'])) {
+		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['sp.date_valid']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['sp.date_livraison']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['sp.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['sp.total_tva']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.total_tva']['label'], $_SERVER["PHP_SELF"], 'sp.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['sp.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['sp.multicurrency_code']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['sp.multicurrency_tx']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['sp.multicurrency_total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['sp.multicurrency_total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['u.login']['checked'])) {
+		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $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['sp.datec']['checked']))     print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['sp.tms']['checked']))       print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap');
-	if (!empty($arrayfields['sp.fk_statut']['checked'])) print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	if (!empty($arrayfields['sp.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['sp.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap');
+	}
+	if (!empty($arrayfields['sp.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print '</tr>'."\n";
 
@@ -678,8 +821,7 @@ if ($resql)
 	$total = 0;
 	$subtotal = 0;
 	$totalarray = array();
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->rowid;
@@ -696,8 +838,7 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 
-		if (!empty($arrayfields['sp.ref']['checked']))
-		{
+		if (!empty($arrayfields['sp.ref']['checked'])) {
 			print '<td class="nowrap">';
 
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
@@ -708,8 +849,7 @@ if ($resql)
 			// Warning
 			$warnornote = '';
 			//if ($obj->fk_statut == 1 && $db->jdate($obj->date_valid) < ($now - $conf->supplier_proposal->warning_delay)) $warnornote .= img_warning($langs->trans("Late"));
-			if ($warnornote)
-			{
+			if ($warnornote) {
 				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
 				print $warnornote;
 				print '</td>';
@@ -723,147 +863,177 @@ if ($resql)
 			print '</td></tr></table>';
 
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Thirdparty
-		if (!empty($arrayfields['s.nom']['checked']))
-		{
+		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax200">';
 			print $companystatic->getNomUrl(1, 'customer');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Town
-		if (!empty($arrayfields['s.town']['checked']))
-		{
+		if (!empty($arrayfields['s.town']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->town;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Zip
-		if (!empty($arrayfields['s.zip']['checked']))
-		{
+		if (!empty($arrayfields['s.zip']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->zip;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// State
-		if (!empty($arrayfields['state.nom']['checked']))
-		{
+		if (!empty($arrayfields['state.nom']['checked'])) {
 			print "<td>".$obj->state_name."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Country
-		if (!empty($arrayfields['country.code_iso']['checked']))
-		{
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
 			$tmparray = getCountry($obj->fk_pays, 'all');
 			print $tmparray['label'];
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Type ent
-		if (!empty($arrayfields['typent.code']['checked']))
-		{
+		if (!empty($arrayfields['typent.code']['checked'])) {
 			print '<td class="center">';
-			if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
+			if (count($typenArray) == 0) {
+				$typenArray = $formcompany->typent_array(1);
+			}
 			print $typenArray[$obj->typent_code];
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Date proposal
-		if (!empty($arrayfields['sp.date_valid']['checked']))
-		{
+		if (!empty($arrayfields['sp.date_valid']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_valid), 'day');
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Date delivery
-		if (!empty($arrayfields['sp.date_livraison']['checked']))
-		{
+		if (!empty($arrayfields['sp.date_livraison']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->dp), 'day');
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Amount HT
-		if (!empty($arrayfields['sp.total_ht']['checked']))
-		{
+		if (!empty($arrayfields['sp.total_ht']['checked'])) {
 			  print '<td class="right">'.price($obj->total_ht)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
-			  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ht';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ht';
+			}
 			  $totalarray['val']['sp.total_ht'] += $obj->total_ht;
 		}
 		// Amount VAT
-		if (!empty($arrayfields['sp.total_tva']['checked']))
-		{
+		if (!empty($arrayfields['sp.total_tva']['checked'])) {
 			print '<td class="right">'.price($obj->total_tva)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'sp.total_tva';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_tva';
+			}
 			$totalarray['val']['sp.total_tva'] += $obj->total_tva;
 		}
 		// Amount TTC
-		if (!empty($arrayfields['sp.total_ttc']['checked']))
-		{
+		if (!empty($arrayfields['sp.total_ttc']['checked'])) {
 			print '<td class="right">'.price($obj->total_ttc)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ttc';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'sp.total_ttc';
+			}
 			$totalarray['val']['sp.total_ttc'] += $obj->total_ttc;
 		}
 
 		// Currency
-		if (!empty($arrayfields['sp.multicurrency_code']['checked']))
-		{
+		if (!empty($arrayfields['sp.multicurrency_code']['checked'])) {
 			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Currency rate
-		if (!empty($arrayfields['sp.multicurrency_tx']['checked']))
-		{
+		if (!empty($arrayfields['sp.multicurrency_tx']['checked'])) {
 			  print '<td class="nowrap">';
 			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
 			  print "</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount HT
-		if (!empty($arrayfields['sp.multicurrency_total_ht']['checked']))
-		{
+		if (!empty($arrayfields['sp.multicurrency_total_ht']['checked'])) {
 			  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount VAT
-		if (!empty($arrayfields['sp.multicurrency_total_vat']['checked']))
-		{
+		if (!empty($arrayfields['sp.multicurrency_total_vat']['checked'])) {
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount TTC
-		if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked']))
-		{
+		if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) {
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		$userstatic->id = $obj->fk_user_author;
 		$userstatic->login = $obj->login;
 
 		// Author
-		if (!empty($arrayfields['u.login']['checked']))
-		{
+		if (!empty($arrayfields['u.login']['checked'])) {
 			print '<td class="center">';
-			if ($userstatic->id) print $userstatic->getLoginUrl(1);
-			else print '&nbsp;';
+			if ($userstatic->id) {
+				print $userstatic->getLoginUrl(1);
+			} else {
+				print '&nbsp;';
+			}
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Extra fields
@@ -873,38 +1043,44 @@ 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['sp.datec']['checked']))
-		{
+		if (!empty($arrayfields['sp.datec']['checked'])) {
 			print '<td class="center nowrap">';
 			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date modification
-		if (!empty($arrayfields['sp.tms']['checked']))
-		{
+		if (!empty($arrayfields['sp.tms']['checked'])) {
 			print '<td class="center nowrap">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Status
-		if (!empty($arrayfields['sp.fk_statut']['checked']))
-		{
+		if (!empty($arrayfields['sp.fk_statut']['checked'])) {
 			print '<td class="right">'.$objectstatic->getLibStatut(5)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Action column
 		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		{
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
 			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print "</tr>\n";
 
@@ -929,7 +1105,9 @@ if ($resql)
 	print '</form>'."\n";
 
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	// Show list of available documents
 	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index 464f31aaaae..372b6b6d20b 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -40,7 +40,9 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal');
 
 $object = new SupplierProposal($db);
@@ -64,19 +66,18 @@ llxHeader('', $langs->trans('CommRequest'), 'EN:Ask_Price_Supplier|FR:Demande_de
 
 $form = new Form($db);
 
-if ($id > 0 || !empty($ref))
-{
-	if ($mesg) print $mesg;
+if ($id > 0 || !empty($ref)) {
+	if ($mesg) {
+		print $mesg;
+	}
 
 	$now = dol_now();
 
-	if ($object->fetch($id, $ref))
-	{
+	if ($object->fetch($id, $ref)) {
 		$object->fetch_thirdparty();
 
 		$societe = new Societe($db);
-		if ($societe->fetch($object->socid))
-		{
+		if ($societe->fetch($object->socid)) {
 			$head = supplier_proposal_prepare_head($object);
 			print dol_get_fiche_head($head, 'note', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
@@ -92,12 +93,10 @@ if ($id > 0 || !empty($ref))
 			// Thirdparty
 			$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->projet->enabled))
-			{
+			if (!empty($conf->projet->enabled)) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-				if ($user->rights->supplier_proposal->creer)
-				{
+				if ($user->rights->supplier_proposal->creer) {
 					if ($action != 'classify') {
 						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 						$morehtmlref .= ' : ';
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index ea6f45e18be..c33c3b2ebac 100644
--- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -18,8 +18,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -35,41 +34,41 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $total = 0;
 $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	?>
-    <tr class="<?php echo $trclass; ?>">
-    	<td><?php echo $langs->trans("SupplierProposal"); ?></td>
-    	<td><a href="<?php echo DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowSupplierProposal"), "supplier_proposal").' '.$objectlink->ref; ?></a></td>
-    	<td></td>
-    	<td class="center"><?php echo dol_print_date($objectlink->datec, 'day'); ?></td>
-    	<td class="right"><?php
+	<tr class="<?php echo $trclass; ?>">
+		<td><?php echo $langs->trans("SupplierProposal"); ?></td>
+		<td><a href="<?php echo DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowSupplierProposal"), "supplier_proposal").' '.$objectlink->ref; ?></a></td>
+		<td></td>
+		<td class="center"><?php echo dol_print_date($objectlink->datec, 'day'); ?></td>
+		<td class="right"><?php
 		if ($user->rights->supplier_proposal->lire) {
 			$total = $total + $objectlink->total_ht;
 			echo price($objectlink->total_ht);
 		} ?></td>
-    	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-    	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
-    </tr>
-    <?php
+		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
+		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	</tr>
+	<?php
 }
-if (count($linkedObjectBlock) > 1)
-{
+if (count($linkedObjectBlock) > 1) {
 	?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
-        <td><?php echo $langs->trans("Total"); ?></td>
-        <td></td>
-    	<td class="center"></td>
-    	<td class="center"></td>
-    	<td class="right"><?php echo price($total); ?></td>
-    	<td class="right"></td>
-    	<td class="right"></td>
-    </tr>
-    <?php
+	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+		<td><?php echo $langs->trans("Total"); ?></td>
+		<td></td>
+		<td class="center"></td>
+		<td class="center"></td>
+		<td class="right"><?php echo price($total); ?></td>
+		<td class="right"></td>
+		<td class="right"></td>
+	</tr>
+	<?php
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index f50d0099263..31236ab5fa9 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -25,7 +25,9 @@
  */
 
 // Define DOL_DOCUMENT_ROOT
-if (!defined('DOL_DOCUMENT_ROOT'))	    define('DOL_DOCUMENT_ROOT', '..');
+if (!defined('DOL_DOCUMENT_ROOT')) {
+	define('DOL_DOCUMENT_ROOT', '..');
+}
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
@@ -44,8 +46,7 @@ $_REQUEST["logtohtml"] = 1;
 
 // Correction PHP_SELF (ex pour apache via caudium) car PHP_SELF doit valoir URL relative
 // et non path absolu.
-if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"])
-{
+if (isset($_SERVER["DOCUMENT_URI"]) && $_SERVER["DOCUMENT_URI"]) {
 	$_SERVER["PHP_SELF"] = $_SERVER["DOCUMENT_URI"];
 }
 
@@ -58,27 +59,28 @@ $conffiletoshowshort = "conf.php";
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
 // For debian/redhat like systems
-if (!file_exists($conffile))
-{
+if (!file_exists($conffile)) {
 	$conffile = "/etc/dolibarr/conf.php";
 	$conffiletoshow = "/etc/dolibarr/conf.php";
 }
 
 
 // Load conf file if it is already defined
-if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
-{
+if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) > 8) { // Test on filesize is to ensure that conf file is more that an empty template with just <?php in first line
 	$result = include_once $conffile; // Load conf file
-	if ($result)
-	{
-		if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type = 'mysql'; // For backward compatibility
+	if ($result) {
+		if (empty($dolibarr_main_db_type)) {
+			$dolibarr_main_db_type = 'mysql'; // For backward compatibility
+		}
 
 		//Mysql driver support has been removed in favor of mysqli
 		if ($dolibarr_main_db_type == 'mysql') {
 			$dolibarr_main_db_type = 'mysqli';
 		}
 
-		if (empty($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) $dolibarr_main_db_port = '3306'; // For backward compatibility
+		if (empty($dolibarr_main_db_port) && ($dolibarr_main_db_type == 'mysqli')) {
+			$dolibarr_main_db_port = '3306'; // For backward compatibility
+		}
 
 		// Clean parameters
 		$dolibarr_main_data_root        = isset($dolibarr_main_data_root) ?trim($dolibarr_main_data_root) : '';
@@ -88,25 +90,31 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
 		$dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ?trim($dolibarr_main_document_root_alt) : '';
 
 		// Remove last / or \ on directories or url value
-		if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root)) $dolibarr_main_document_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root);
-		if (!empty($dolibarr_main_url_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root))      $dolibarr_main_url_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root);
-		if (!empty($dolibarr_main_data_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_data_root))     $dolibarr_main_data_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_data_root);
-		if (!empty($dolibarr_main_document_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root_alt))	$dolibarr_main_document_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root_alt);
-		if (!empty($dolibarr_main_url_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root_alt))		$dolibarr_main_url_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root_alt);
+		if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root)) {
+			$dolibarr_main_document_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root);
+		}
+		if (!empty($dolibarr_main_url_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root)) {
+			$dolibarr_main_url_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root);
+		}
+		if (!empty($dolibarr_main_data_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_data_root)) {
+			$dolibarr_main_data_root = preg_replace('/[\\/]+$/', '', $dolibarr_main_data_root);
+		}
+		if (!empty($dolibarr_main_document_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root_alt)) {
+			$dolibarr_main_document_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_document_root_alt);
+		}
+		if (!empty($dolibarr_main_url_root_alt) && !preg_match('/^[\\/]+$/', $dolibarr_main_url_root_alt)) {
+			$dolibarr_main_url_root_alt = preg_replace('/[\\/]+$/', '', $dolibarr_main_url_root_alt);
+		}
 
 		// Create conf object
-		if (!empty($dolibarr_main_document_root))
-		{
+		if (!empty($dolibarr_main_document_root)) {
 			$result = conf($dolibarr_main_document_root);
 		}
 		// Load database driver
-		if ($result)
-		{
-			if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type))
-			{
+		if ($result) {
+			if (!empty($dolibarr_main_document_root) && !empty($dolibarr_main_db_type)) {
 				$result = include_once $dolibarr_main_document_root."/core/db/".$dolibarr_main_db_type.'.class.php';
-				if (!$result)
-				{
+				if (!$result) {
 					$includeconferror = 'ErrorBadValueForDolibarrMainDBType';
 				}
 			}
@@ -120,7 +128,9 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
 $conf->global->MAIN_LOGTOHTML = 1;
 
 // Define prefix
-if (!isset($dolibarr_main_db_prefix) || !$dolibarr_main_db_prefix) $dolibarr_main_db_prefix = 'llx_';
+if (!isset($dolibarr_main_db_prefix) || !$dolibarr_main_db_prefix) {
+	$dolibarr_main_db_prefix = 'llx_';
+}
 define('MAIN_DB_PREFIX', (isset($dolibarr_main_db_prefix) ? $dolibarr_main_db_prefix : ''));
 
 define('DOL_CLASS_PATH', 'class/'); // Filsystem path to class dir
@@ -128,27 +138,44 @@ define('DOL_DATA_ROOT', (isset($dolibarr_main_data_root) ? $dolibarr_main_data_r
 define('DOL_MAIN_URL_ROOT', (isset($dolibarr_main_url_root) ? $dolibarr_main_url_root : '')); // URL relative root
 $uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT')); // $uri contains url without http*
 $suburi = strstr($uri, '/'); // $suburi contains url without domain
-if ($suburi == '/') $suburi = ''; // If $suburi is /, it is now ''
+if ($suburi == '/') {
+	$suburi = ''; // If $suburi is /, it is now ''
+}
 define('DOL_URL_ROOT', $suburi); // URL relative root ('', '/dolibarr', ...)
 
-if (empty($character_set_client)) $character_set_client = "UTF-8";
+if (empty($character_set_client)) {
+	$character_set_client = "UTF-8";
+}
 $conf->file->character_set_client = strtoupper($character_set_client);
-if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : ''); // Old installation
+if (empty($dolibarr_main_db_character_set)) {
+	$dolibarr_main_db_character_set = ($conf->db->type == 'mysqli' ? 'utf8' : ''); // Old installation
+}
 $conf->db->character_set = $dolibarr_main_db_character_set;
-if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : ''); // Old installation
+if (empty($dolibarr_main_db_collation)) {
+	$dolibarr_main_db_collation = ($conf->db->type == 'mysqli' ? 'utf8_unicode_ci' : ''); // Old installation
+}
 $conf->db->dolibarr_main_db_collation = $dolibarr_main_db_collation;
-if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
+if (empty($dolibarr_main_db_encryption)) {
+	$dolibarr_main_db_encryption = 0;
+}
 $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
-if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
+if (empty($dolibarr_main_db_cryptkey)) {
+	$dolibarr_main_db_cryptkey = '';
+}
 $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
-if (empty($conf->db->user)) $conf->db->user = '';
+if (empty($conf->db->user)) {
+	$conf->db->user = '';
+}
 
 
 // Defini objet langs
 $langs = new Translate('..', $conf);
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
-else $langs->setDefaultLang('auto');
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+} else {
+	$langs->setDefaultLang('auto');
+}
 
 $bc[false] = ' class="bg1"';
 $bc[true] = ' class="bg2"';
@@ -172,7 +199,9 @@ function conf($dolibarr_main_document_root)
 	global $character_set_client;
 
 	$return = include_once $dolibarr_main_document_root.'/core/class/conf.class.php';
-	if (!$return) return -1;
+	if (!$return) {
+		return -1;
+	}
 
 	$conf = new Conf();
 	$conf->db->type = trim($dolibarr_main_db_type);
@@ -182,7 +211,9 @@ function conf($dolibarr_main_document_root)
 	$conf->db->user = trim($dolibarr_main_db_user);
 	$conf->db->pass = trim($dolibarr_main_db_pass);
 
-	if (empty($conf->db->dolibarr_main_db_collation)) $conf->db->dolibarr_main_db_collation = 'utf8_unicode_ci';
+	if (empty($conf->db->dolibarr_main_db_collation)) {
+		$conf->db->dolibarr_main_db_collation = 'utf8_unicode_ci';
+	}
 
 	return 1;
 }
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index cecada7ed65..220da1290ac 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -31,9 +31,12 @@
 include_once 'inc.php';
 $uri = preg_replace('/^http(s?):\/\//i', '', $dolibarr_main_url_root);
 $pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine
-if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a ''
-if (!defined('DOL_URL_ROOT'))
+if ($pos == '/') {
+	$pos = ''; // si $pos vaut /, on le met a ''
+}
+if (!defined('DOL_URL_ROOT')) {
 	define('DOL_URL_ROOT', $pos); // URL racine relative
+}
 
 $langs->loadLangs(array("other", $langs->load("help")));
 
@@ -49,10 +52,18 @@ print $langs->trans("HelpCenterDesc2")."<br>\n";
 print '<br>';
 
 $homeurl = DOL_URL_ROOT.'/';
-if (GETPOST('dol_hide_toptmenu'))  $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_toptmenu=1';
-if (GETPOST('dol_hide_leftmenu'))  $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_leftmenu=1';
-if (GETPOST('dol_no_mouse_hover')) $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_no_mouse_hover=1';
-if (GETPOST('dol_use_jmobile'))    $homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_use_jmobile=1';
+if (GETPOST('dol_hide_toptmenu')) {
+	$homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_toptmenu=1';
+}
+if (GETPOST('dol_hide_leftmenu')) {
+	$homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_hide_leftmenu=1';
+}
+if (GETPOST('dol_no_mouse_hover')) {
+	$homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_no_mouse_hover=1';
+}
+if (GETPOST('dol_use_jmobile')) {
+	$homeurl .= (strpos($homeurl, '?') === false ? '?' : '&').'dol_use_jmobile=1';
+}
 print $langs->trans("ToGoBackToDolibarr", $homeurl);
 
 print '<br><br>';
@@ -86,20 +97,38 @@ print '<td align="center" valign="middle">';
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
 $urlwiki = 'https://wiki.dolibarr.org';
-if (preg_match('/fr/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Accueil';
-if (preg_match('/es/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Portada';
-if (preg_match('/de/i', $langs->defaultlang)) $urlwiki = 'https://wiki.dolibarr.org/index.php/Hauptseite';
+if (preg_match('/fr/i', $langs->defaultlang)) {
+	$urlwiki = 'https://wiki.dolibarr.org/index.php/Accueil';
+}
+if (preg_match('/es/i', $langs->defaultlang)) {
+	$urlwiki = 'https://wiki.dolibarr.org/index.php/Portada';
+}
+if (preg_match('/de/i', $langs->defaultlang)) {
+	$urlwiki = 'https://wiki.dolibarr.org/index.php/Hauptseite';
+}
 print '<br>'.$langs->trans("ForDocumentationSeeWiki", $urlwiki, $urlwiki);
 print '<br>';
 $urlforum = 'https://www.dolibarr.org/forum/';
 $urlforumlocal = 'https://www.dolibarr.org/forum/';
-if (preg_match('/fr/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.fr/forum/';
-if (preg_match('/es/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.es/foro/';
-if (preg_match('/it/i', $langs->defaultlang)) $urlforumlocal = 'http://www.dolibarr.it/forum/';
-if (preg_match('/gr/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.gr/forum/';
-if (preg_match('/de/i', $langs->defaultlang)) $urlforumlocal = 'https://www.dolibarr.de/forum/';
+if (preg_match('/fr/i', $langs->defaultlang)) {
+	$urlforumlocal = 'https://www.dolibarr.fr/forum/';
+}
+if (preg_match('/es/i', $langs->defaultlang)) {
+	$urlforumlocal = 'https://www.dolibarr.es/foro/';
+}
+if (preg_match('/it/i', $langs->defaultlang)) {
+	$urlforumlocal = 'http://www.dolibarr.it/forum/';
+}
+if (preg_match('/gr/i', $langs->defaultlang)) {
+	$urlforumlocal = 'https://www.dolibarr.gr/forum/';
+}
+if (preg_match('/de/i', $langs->defaultlang)) {
+	$urlforumlocal = 'https://www.dolibarr.de/forum/';
+}
 print '<br>'.$langs->trans("ForAnswersSeeForum", $urlforumlocal, $urlforumlocal).'<br>';
-if ($urlforumlocal != $urlforum) print '<b><a href="'.$urlforum.'">'.$urlforum.'</a></b>';
+if ($urlforumlocal != $urlforum) {
+	print '<b><a href="'.$urlforum.'">'.$urlforum.'</a></b>';
+}
 print '</td></tr></table>';
 print '</td>';
 print '</tr>';
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index eb956ea9f32..ef448607b10 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -30,7 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $langs->loadLangs(array("admin", "cashdesk", "commercial"));
 
@@ -38,8 +40,7 @@ $langs->loadLangs(array("admin", "cashdesk", "commercial"));
  * Actions
  */
 
-if (GETPOST('action', 'alpha') == 'set')
-{
+if (GETPOST('action', 'alpha') == 'set') {
 	$db->begin();
 
 	$res = dolibarr_set_const($db, "TAKEPOS_COLOR_THEME", GETPOST('TAKEPOS_COLOR_THEME', 'alpha'), 'chaine', 0, '', $conf->entity);
@@ -47,18 +48,18 @@ if (GETPOST('action', 'alpha') == 'set')
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif (GETPOST('action', 'alpha') == 'setmethod')
-{
+} elseif (GETPOST('action', 'alpha') == 'setmethod') {
 	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 }
 
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index f5f678ec900..09f3b13d4d1 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -30,7 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $langs->loadLangs(array("admin", "cashdesk", "printing"));
 
@@ -41,22 +43,22 @@ $res = 0;
  * Actions
  */
 
-if (GETPOST('action', 'alpha') == 'set')
-{
+if (GETPOST('action', 'alpha') == 'set') {
 	$db->begin();
 
 	dol_syslog("admin/bar");
 
 	$suplement_category = GETPOST('TAKEPOS_SUPPLEMENTS_CATEGORY', 'alpha');
-	if ($suplement_category < 0) $suplement_category = 0;
+	if ($suplement_category < 0) {
+		$suplement_category = 0;
+	}
 
 	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS_CATEGORY", $suplement_category, 'chaine', 0, '', $conf->entity);
 	if ($res <= 0) {
 		$error++;
 	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -153,8 +155,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
 
-	if ($conf->global->TAKEPOS_SUPPLEMENTS)
-	{
+	if ($conf->global->TAKEPOS_SUPPLEMENTS) {
 		print '<tr class="oddeven"><td>';
 		print $langs->trans("SupplementCategory");
 		print '</td>';
@@ -187,8 +188,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 }
 
 if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
-	if ($conf->global->TAKEPOS_QR_MENU)
-	{
+	if ($conf->global->TAKEPOS_QR_MENU) {
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		print '<br>';
@@ -205,8 +205,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 		print '</table>';
 	}
 
-	if ($conf->global->TAKEPOS_AUTO_ORDER)
-	{
+	if ($conf->global->TAKEPOS_AUTO_ORDER) {
 		print '<br>';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index 9ec59fb388b..eb23f26806c 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -34,7 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $langs->loadLangs(array("main"), "categories", "takepos", "printing");
 
-if (!$user->rights->categorie->lire) accessforbidden();
+if (!$user->rights->categorie->lire) {
+	accessforbidden();
+}
 
 $id = GETPOST('id', 'int');
 $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
@@ -44,31 +46,39 @@ $printer1 = GETPOST('printer1', 'alpha');
 $printer2 = GETPOST('printer2', 'alpha');
 $printer3 = GETPOST('printer3', 'alpha');
 
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) {
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+}
 
 /*
  * Actions
  */
 if ($action == "SavePrinter1") {
 	$printedcategories = ";";
-	if (is_array($printer1)) foreach ($printer1 as $cat) {
-		$printedcategories = $printedcategories.$cat.";";
+	if (is_array($printer1)) {
+		foreach ($printer1 as $cat) {
+			$printedcategories = $printedcategories.$cat.";";
+		}
 	}
 	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_1", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == "SavePrinter2") {
 	$printedcategories = ";";
-	if (is_array($printer2)) foreach ($printer2 as $cat) {
-		$printedcategories = $printedcategories.$cat.";";
+	if (is_array($printer2)) {
+		foreach ($printer2 as $cat) {
+			$printedcategories = $printedcategories.$cat.";";
+		}
 	}
 	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == "SavePrinter3") {
 	$printedcategories = ";";
-	if (is_array($printer3)) foreach ($printer3 as $cat) {
-		$printedcategories = $printedcategories.$cat.";";
+	if (is_array($printer3)) {
+		foreach ($printer3 as $cat) {
+			$printedcategories = $printedcategories.$cat.";";
+		}
 	}
 	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_3", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
@@ -145,8 +155,7 @@ $fulltree = $cate_arbo;
 // Define data (format for treeview)
 $data = array();
 $data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
-foreach ($fulltree as $key => $val)
-{
+foreach ($fulltree as $key => $val) {
 	$categstatic->id = $val['id'];
 	$categstatic->ref = $val['label'];
 	$categstatic->color = $val['color'];
@@ -168,13 +177,18 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 1</td><td></td><
 print '</td></tr>';
 $nbofentries = (count($data) - 1);
 print '<form action="orderprinters.php">';
-if ($nbofentries > 0)
-{
+if ($nbofentries > 0) {
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter1">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
-		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_1, ';'.$row["rowid"].';') !== false) {
+			$checked = 'checked';
+		} else {
+			$checked = '';
+		}
+		if ($row["fk_menu"] == 0) {
+			print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		}
 	}
 	print '</td></tr>';
 } else {
@@ -196,13 +210,18 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 2</td><td></td><
 print '</td></tr>';
 $nbofentries = (count($data) - 1);
 print '<form action="orderprinters.php">';
-if ($nbofentries > 0)
-{
+if ($nbofentries > 0) {
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter2">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
-		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_2, ';'.$row["rowid"].';') !== false) {
+			$checked = 'checked';
+		} else {
+			$checked = '';
+		}
+		if ($row["fk_menu"] == 0) {
+			print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		}
 	}
 	print '</td></tr>';
 } else {
@@ -224,13 +243,18 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 3</td><td></td><
 print '</td></tr>';
 $nbofentries = (count($data) - 1);
 print '<form action="orderprinters.php">';
-if ($nbofentries > 0)
-{
+if ($nbofentries > 0) {
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter3">';
 	foreach ($data as $row) {
-		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_3, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
-		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer3[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_3, ';'.$row["rowid"].';') !== false) {
+			$checked = 'checked';
+		} else {
+			$checked = '';
+		}
+		if ($row["fk_menu"] == 0) {
+			print '<input type="checkbox" name="printer3[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+		}
 	}
 	print '</td></tr>';
 } else {
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index e0beeedf502..7d0ce8897e3 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -36,7 +36,9 @@ if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id'])) {
 }
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $langs->loadLangs(array("admin", "cashdesk"));
 
@@ -61,7 +63,9 @@ if ($resql) {
 
 if (GETPOST('action', 'alpha') == 'set') {
 	$db->begin();
-	if (GETPOST('socid', 'int') < 0) $_POST["socid"] = '';
+	if (GETPOST('socid', 'int') < 0) {
+		$_POST["socid"] = '';
+	}
 
 	$res = dolibarr_set_const($db, "CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_ROOT_CATEGORY_ID", GETPOST('TAKEPOS_ROOT_CATEGORY_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
@@ -86,7 +90,9 @@ if (GETPOST('action', 'alpha') == 'set') {
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
 	if (!$error) {
 		$db->commit();
diff --git a/htdocs/takepos/admin/printqr.php b/htdocs/takepos/admin/printqr.php
index d459fedf58f..87f742fe544 100644
--- a/htdocs/takepos/admin/printqr.php
+++ b/htdocs/takepos/admin/printqr.php
@@ -24,7 +24,9 @@
 require '../../main.inc.php';
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $langs->load("cashdesk");
 
@@ -37,8 +39,7 @@ print '<center>';
 if (GETPOSTISSET("id")) {
 	print '<h1><b>'.$langs->trans("ScanToOrder").'</b></h1>';
 	print "<img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?key=".dol_encode($id)."' width='30%'>";
-}
-else {
+} else {
 	print '<h1><b>'.$langs->trans("ScanToMenu").'</b></h1>';
 	print "<img src='".DOL_URL_ROOT."/takepos/genimg/qr.php' width='30%'>";
 }
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index aec1e9343a4..8c201949034 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -31,7 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $langs->loadLangs(array("admin", "cashdesk", "commercial"));
 
@@ -39,8 +41,7 @@ $langs->loadLangs(array("admin", "cashdesk", "commercial"));
  * Actions
  */
 
-if (GETPOST('action', 'alpha') == 'set')
-{
+if (GETPOST('action', 'alpha') == 'set') {
 	$db->begin();
 
 	$res = dolibarr_set_const($db, "TAKEPOS_HEADER", GETPOST('TAKEPOS_HEADER', 'alpha'), 'chaine', 0, '', $conf->entity);
@@ -53,21 +54,23 @@ if (GETPOST('action', 'alpha') == 'set')
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif (GETPOST('action', 'alpha') == 'setmethod')
-{
+} elseif (GETPOST('action', 'alpha') == 'setmethod') {
 	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 	// TakePOS connector require ReceiptPrinter module
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && !$conf->receiptprinter->enabled) activateModule("modReceiptPrinter");
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && !$conf->receiptprinter->enabled) {
+		activateModule("modReceiptPrinter");
+	}
 }
 
 
@@ -103,8 +106,7 @@ print $langs->trans('Browser');
 print '<td>';
 print $langs->trans('BrowserMethodDescription');
 print '</td><td class="right">';
-if ($conf->global->TAKEPOS_PRINT_METHOD == "browser")
-{
+if ($conf->global->TAKEPOS_PRINT_METHOD == "browser") {
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
 	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=browser">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
@@ -138,8 +140,7 @@ print "TakePOS Connector";
 print '<td>';
 print $langs->trans('TakeposConnectorMethodDescription');
 print '</td><td class="right">';
-if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
-{
+if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
 	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=takeposconnector">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
@@ -177,15 +178,16 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	$substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
 	$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
 	$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-	foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
+	foreach ($substitutionarray as $key => $val) {
+		$htmltext .= $key.'<br>';
+	}
 	$htmltext .= '</i>';
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices")." - ".$langs->trans("Header"), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 	print '</td><td>';
 	$variablename = 'TAKEPOS_HEADER';
-	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
-	{
+	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -198,8 +200,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices")." - ".$langs->trans("Footer"), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 	print '</td><td>';
 	$variablename = 'TAKEPOS_FOOTER';
-	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
-	{
+	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 6d0949389a5..c764cd1e566 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -32,15 +32,16 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 // If socid provided by ajax company selector
-if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id']))
-{
+if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id'])) {
 	$_GET['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
 	$_POST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
 	$_REQUEST['CASHDESK_ID_THIRDPARTY'] = GETPOST('CASHDESK_ID_THIRDPARTY_id', 'alpha');
 }
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $langs->loadLangs(array("admin", "cashdesk"));
 
@@ -67,10 +68,11 @@ $action = GETPOST('action', 'aZ09');
 
 $error = 0;
 
-if ($action == 'set')
-{
+if ($action == 'set') {
 	$db->begin();
-	if (GETPOST('socid', 'int') < 0) $_POST["socid"] = '';
+	if (GETPOST('socid', 'int') < 0) {
+		$_POST["socid"] = '';
+	}
 
 	$res = dolibarr_set_const($db, "TAKEPOS_ROOT_CATEGORY_ID", GETPOST('TAKEPOS_ROOT_CATEGORY_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS_CATEGORY", GETPOST('TAKEPOS_SUPPLEMENTS_CATEGORY', 'alpha'), 'chaine', 0, '', $conf->entity);
@@ -86,10 +88,11 @@ if ($action == 'set')
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -97,7 +100,9 @@ if ($action == 'set')
 } elseif ($action == 'updateMask') {
 	$maskconst = GETPOST('maskconst', 'alpha');
 	$maskvalue = GETPOST('maskvalue', 'alpha');
-	if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+	if ($maskconst) {
+		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+	}
 	if (!($res > 0)) {
 		$error++;
 	}
@@ -146,21 +151,16 @@ print '</tr>'."\n";
 
 clearstatcache();
 
-foreach ($dirmodels as $reldir)
-{
+foreach ($dirmodels as $reldir) {
 	$dir = dol_buildpath($reldir."core/modules/takepos/");
 
-	if (is_dir($dir))
-	{
+	if (is_dir($dir)) {
 		$handle = opendir($dir);
-		if (is_resource($handle))
-		{
+		if (is_resource($handle)) {
 			$var = true;
 
-			while (($file = readdir($handle)) !== false)
-			{
-				if (substr($file, 0, 16) == 'mod_takepos_ref_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
-				{
+			while (($file = readdir($handle)) !== false) {
+				if (substr($file, 0, 16) == 'mod_takepos_ref_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
 					$file = substr($file, 0, dol_strlen($file) - 4);
 
 					require_once $dir.$file.'.php';
@@ -168,11 +168,14 @@ foreach ($dirmodels as $reldir)
 					$module = new $file;
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						continue;
+					}
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						continue;
+					}
 
-					if ($module->isEnabled())
-					{
+					if ($module->isEnabled()) {
 						print '<tr class="oddeven"><td>'.$module->nom."</td><td>\n";
 						print $module->info();
 						print '</td>';
@@ -183,13 +186,15 @@ foreach ($dirmodels as $reldir)
 						if (preg_match('/^Error/', $tmp)) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans($tmp).'</div>';
-						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-						else print $tmp;
+						} elseif ($tmp == 'NotConfigured') {
+							print $langs->trans($tmp);
+						} else {
+							print $tmp;
+						}
 						print '</td>'."\n";
 
 						print '<td align="center">';
-						if ($conf->global->TAKEPOS_REF_ADDON == "$file")
-						{
+						if ($conf->global->TAKEPOS_REF_ADDON == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
@@ -211,8 +216,9 @@ foreach ($dirmodels as $reldir)
 						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
 							$htmltooltip .= ''.$langs->trans("NextValue").': ';
 							if ($nextval) {
-								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+								if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 									$nextval = $langs->trans($nextval);
+								}
 								$htmltooltip .= $nextval.'<br>';
 							} else {
 								$htmltooltip .= $langs->trans($module->error).'<br>';
@@ -256,8 +262,7 @@ print $form->selectarray('TAKEPOS_NUM_TERMINALS', $array, (empty($conf->global->
 print "</td></tr>\n";
 
 // Services
-if (!empty($conf->service->enabled))
-{
+if (!empty($conf->service->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("CashdeskShowServices");
 	print '<td colspan="2">';
@@ -292,7 +297,9 @@ print "</td></tr>\n";
 $substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
-foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
+foreach ($substitutionarray as $key => $val) {
+	$htmltext .= $key.'<br>';
+}
 $htmltext .= '</i>';
 
 // Payment numpad
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index ed4ef31af36..3e5bb4ccc46 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -31,15 +31,16 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
 
 $terminal = GETPOST('terminal', 'int');
 // If socid provided by ajax company selector
-if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY'.$terminal.'_id']))
-{
+if (!empty($_REQUEST['CASHDESK_ID_THIRDPARTY'.$terminal.'_id'])) {
 	$_GET['CASHDESK_ID_THIRDPARTY'.$terminal] = GETPOST('CASHDESK_ID_THIRDPARTY'.$terminal.'_id', 'alpha');
 	$_POST['CASHDESK_ID_THIRDPARTY'.$terminal] = GETPOST('CASHDESK_ID_THIRDPARTY'.$terminal.'_id', 'alpha');
 	$_REQUEST['CASHDESK_ID_THIRDPARTY'.$terminal] = GETPOST('CASHDESK_ID_THIRDPARTY'.$terminal.'_id', 'alpha');
 }
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $langs->loadLangs(array("admin", "cashdesk", "printing", "receiptprinter"));
 
@@ -64,10 +65,11 @@ $terminaltouse = $terminal;
  * Actions
  */
 
-if (GETPOST('action', 'alpha') == 'set')
-{
+if (GETPOST('action', 'alpha') == 'set') {
 	$db->begin();
-	if (GETPOST('socid', 'int') < 0) $_POST["socid"] = '';
+	if (GETPOST('socid', 'int') < 0) {
+		$_POST["socid"] = '';
+	}
 
 	$res = dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY".$terminaltouse, (GETPOST('socid', 'int') > 0 ? GETPOST('socid', 'int') : ''), 'chaine', 0, '', $conf->entity);
 
@@ -78,7 +80,9 @@ if (GETPOST('action', 'alpha') == 'set')
 		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_SUMUP".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	}
 	foreach ($paiements as $modep) {
-		if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue;
+		if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) {
+			continue;
+		}
 		$name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
 		$res = dolibarr_set_const($db, $name, (GETPOST($name, 'alpha') > 0 ? GETPOST($name, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	}
@@ -101,10 +105,11 @@ if (GETPOST('action', 'alpha') == 'set')
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -147,45 +152,55 @@ print $form->select_company($conf->global->{'CASHDESK_ID_THIRDPARTY'.$terminalto
 print '</td></tr>';
 
 $atleastonefound = 0;
-if (!empty($conf->banque->enabled))
-{
+if (!empty($conf->banque->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td>';
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 0, "courant=2", 1);
-	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse})) $atleastonefound++;
+	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse})) {
+		$atleastonefound++;
+	}
 	print '</td></tr>';
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
 	print '<td>';
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 0, "courant=1", 1);
-	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse})) $atleastonefound++;
+	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse})) {
+		$atleastonefound++;
+	}
 	print '</td></tr>';
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
 	print '<td>';
 	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 0, "courant=1", 1);
-	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse})) $atleastonefound++;
+	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse})) {
+		$atleastonefound++;
+	}
 	print '</td></tr>';
 	if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSumup").'</td>';
 		print '<td>';
 		$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 0, "courant=1", 1);
-		if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse})) $atleastonefound++;
+		if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse})) {
+			$atleastonefound++;
+		}
 		print '</td></tr>';
 	}
 
 	foreach ($paiements as $modep) {
-		if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) continue; // Already managed before
+		if (in_array($modep->code, array('LIQ', 'CB', 'CHQ'))) {
+			continue; // Already managed before
+		}
 		$name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountFor").' '.$langs->trans($modep->label).'</td>';
 		print '<td>';
-		if (!empty($conf->global->$name)) $atleastonefound++;
+		if (!empty($conf->global->$name)) {
+			$atleastonefound++;
+		}
 		$cour = preg_match('/^LIQ.*/', $modep->code) ? 2 : 1;
 		$form->select_comptes($conf->global->$name, $name, 0, "courant=".$cour, 1);
 		print '</td></tr>';
 	}
 }
 
-if (!empty($conf->stock->enabled))
-{
+if (!empty($conf->stock->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
 	print '<td>';
 	if (empty($conf->productbatch->enabled) || !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
@@ -204,8 +219,7 @@ if (!empty($conf->stock->enabled))
 
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>'; // Force warehouse (this is not a default value)
 	print '<td class="minwidth300">';
-	if (!$disabled)
-	{
+	if (!$disabled) {
 		print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled, 0, '', 0, 0, array(), 'maxwidth250');
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?&terminal='.$terminal).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 	} else {
@@ -279,44 +293,42 @@ if ($conf->global->TAKEPOS_ADDON == "terminal") {
 	print '<td colspan="2">';
 	$array = array(0=>$langs->trans("Default"));
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$dir = dol_buildpath($reldir."core/modules/facture/");
-		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) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS'))
-					{
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
+					if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')) {
 						$filebis = $file;
 						$classname = preg_replace('/\.php$/', '', $file);
 						// For compatibility
-						if (!is_file($dir.$filebis))
-						{
+						if (!is_file($dir.$filebis)) {
 							$filebis = $file."/".$file.".modules.php";
 							$classname = "mod_facture_".$file;
 						}
 						// Check if there is a filter on country
 						preg_match('/\-(.*)_(.*)$/', $classname, $reg);
-						if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
+						if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) {
+							continue;
+						}
 
 						$classname = preg_replace('/\-.*$/', '', $classname);
-						if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php')
-						{
+						if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php') {
 							// Charging the numbering class
 							require_once $dir.$filebis;
 
 							$module = new $classname($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								continue;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								continue;
+							}
 
-							if ($module->isEnabled())
-							{
+							if ($module->isEnabled()) {
 								$array[preg_replace('/\-.*$/', '', preg_replace('/\.php$/', '', $file))] = preg_replace('/\-.*$/', '', preg_replace('/mod_facture_/', '', preg_replace('/\.php$/', '', $file)));
 							}
 						}
@@ -339,7 +351,9 @@ print '</div>';
 $substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__'] = $langs->trans('Translation');
 $htmltext = '<i>'.$langs->trans('AvailableVariables').':<br>';
-foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
+foreach ($substitutionarray as $key => $val) {
+	$htmltext .= $key.'<br>';
+}
 $htmltext .= '</i>';
 
 print '<br>';
@@ -386,8 +400,7 @@ print '</td></tr>';
 print '</table>';
 print '</div>';
 
-if ($atleastonefound == 0 && !empty($conf->banque->enabled))
-{
+if ($atleastonefound == 0 && !empty($conf->banque->enabled)) {
 	print info_admin($langs->trans("AtLeastOneDefaultBankAccountMandatory"), 0, 0, 'error');
 }
 
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 6da8c74361c..9be52f21031 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -25,12 +25,24 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
 
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -51,16 +63,15 @@ if (empty($user->rights->takepos->run)) {
 
 if ($action == 'getProducts') {
 	$object = new Categorie($db);
-	if ($category == "supplements") $category = $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY;
+	if ($category == "supplements") {
+		$category = $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY;
+	}
 	$result = $object->fetch($category);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$prods = $object->getObjectsInCateg("product", 0, 0, 0, $conf->global->TAKEPOS_SORTPRODUCTFIELD, 'ASC');
 		// Removed properties we don't need
-		if (is_array($prods) && count($prods) > 0)
-		{
-			foreach ($prods as $prod)
-			{
+		if (is_array($prods) && count($prods) > 0) {
+			foreach ($prods as $prod) {
 				unset($prod->fields);
 				unset($prod->db);
 			}
@@ -95,8 +106,7 @@ if ($action == 'getProducts') {
 		//$result = $object->fetch($conf->global->TAKEPOS_ROOT_CATEGORY_ID);
 		$arrayofcateg = $object->get_full_arbo('product', $conf->global->TAKEPOS_ROOT_CATEGORY_ID, 1);
 		if (is_array($arrayofcateg) && count($arrayofcateg) > 0) {
-			foreach ($arrayofcateg as $val)
-			{
+			foreach ($arrayofcateg as $val) {
 				$filteroncategids .= ($filteroncategids ? ', ' : '').$val['id'];
 			}
 		}
@@ -110,8 +120,7 @@ if ($action == 'getProducts') {
 	$sql .= ' AND tosell = 1';
 	$sql .= natural_search(array('ref', 'label', 'barcode'), $term);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$rows = array();
 		while ($obj = $db->fetch_object($resql)) {
 			$rows[] = array(
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 6cd6073eb48..589c10ddf62 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -27,14 +27,26 @@
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1); // File must be accessed by logon page so without login
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1); // File must be accessed by logon page so without login
+}
 //if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 
 define('ISLOADEDBYSTEELSHEET', '1');
@@ -48,25 +60,30 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 // Define css type
 top_httphead('text/css');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 
 require DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-if (defined('THEME_ONLY_CONSTANT')) return;
+if (defined('THEME_ONLY_CONSTANT')) {
+	return;
+}
 
 ?>
 
 html,body {
-    box-sizing: border-box;
+	box-sizing: border-box;
 	padding:0px;
-    margin:0;
-    height:100%;
+	margin:0;
+	height:100%;
 	width:100%;
 }
 
 .bodytakepos {
-    background-color: #EEE;
+	background-color: #EEE;
 }
 
 .center {
@@ -74,14 +91,14 @@ html,body {
 }
 
 button.calcbutton.poscolorblue {
-    background-color: #0066AA;
+	background-color: #0066AA;
 }
 
 button.calcbutton2.poscolordelete {
 	background: rgb(255, 188, 185);
-    color: #633;
-    /*background-color: #884444;
-    color: #fff;*/
+	color: #633;
+	/*background-color: #884444;
+	color: #fff;*/
 }
 
 button.calcbutton {
@@ -96,19 +113,19 @@ button.calcbutton {
 	width: calc(25% - 2px);
 	height: calc(25% - 2px);
 	font-weight: bold;
-    background-color: #8c907e;
-    color: #fff;
-    /* border-color: unset; */
-    border-width: 0;
-    margin: 1px;
+	background-color: #8c907e;
+	color: #fff;
+	/* border-color: unset; */
+	border-width: 0;
+	margin: 1px;
 	font-size: 14pt;
-    border-radius: 3px;
+	border-radius: 3px;
 }
 
 button.calcbutton2 {
-    color: #fff;
-    background-color: #5555AA;
-    border-width: 0px;
+	color: #fff;
+	background-color: #5555AA;
+	border-width: 0px;
 	display: inline-block;
 	position: relative;
 	padding: 0;
@@ -122,7 +139,7 @@ button.calcbutton2 {
 	font-weight: bold;
 	font-size: 10pt;
 	margin: 1px;
-    border-radius: 3px;
+	border-radius: 3px;
 }
 
 button.calcbutton2 .iconwithlabel {
@@ -142,7 +159,7 @@ button.calcbutton3 {
 	height: calc(25% - 2px);
 	font-size: 14pt;
 	margin: 1px;
-    border-radius: 3px;
+	border-radius: 3px;
 }
 
 button.productbutton {
@@ -157,20 +174,20 @@ button.productbutton {
 	width: calc(100% - 2px);
 	height: calc(100% - 2px);
 	font-weight: bold;
-    background-color: #a3a6a3;
-    color: #fff;
-    /* border-color: unset; */
-    border-width: 0;
-    margin: 1px;
+	background-color: #a3a6a3;
+	color: #fff;
+	/* border-color: unset; */
+	border-width: 0;
+	margin: 1px;
 	font-size: 14pt;
-    border-radius: 3px;
+	border-radius: 3px;
 }
 
 button.actionbutton {
-    background: #EABCA6;
-    border: 2px solid #EEE;
-    min-height: 40px;
-    border-radius: 3px;
+	background: #EABCA6;
+	border: 2px solid #EEE;
+	min-height: 40px;
+	border-radius: 3px;
 }
 
 button.actionbutton {
@@ -185,7 +202,7 @@ button.actionbutton {
 	width: calc(33.33% - 2px);
 	height: calc(25% - 2px);
 	margin: 1px;
-   	border-width: 0;
+	   border-width: 0;
 }
 
 button.item_value {
@@ -202,10 +219,10 @@ button.item_value.selected {
 }
 
 div[aria-describedby="dialog-info"] button:before {
-    content: "\f788";
-    font-family: "Font Awesome 5 Free";
-    font-weight: 900;
-    padding-right: 5px;
+	content: "\f788";
+	font-family: "Font Awesome 5 Free";
+	font-weight: 900;
+	padding-right: 5px;
 }
 div[aria-describedby="dialog-info"].ui-dialog .ui-dialog-buttonpane {
 	border-width: 0;
@@ -216,7 +233,7 @@ div[aria-describedby="dialog-info"].ui-dialog .ui-dialog-buttonpane {
 }
 
 .fa.fa-trash:before {
-    font-size: 1.5em;
+	font-size: 1.5em;
 }
 
 
@@ -249,11 +266,11 @@ div.wrapper2{
 }
 
 img.imgwrapper {
-    max-width: 100%;
+	max-width: 100%;
 }
 
 button:active{
-    background:black;
+	background:black;
 	color: white;
 }
 
@@ -270,7 +287,7 @@ div.description{
 	text-align:center;
 
 	padding-top: 30px;
-    background: -webkit-linear-gradient(top, rgba(250,250,250,0), rgba(250,250,250,0.5), rgba(250,250,250,0.95), rgba(250,250,250,1));
+	background: -webkit-linear-gradient(top, rgba(250,250,250,0), rgba(250,250,250,0.5), rgba(250,250,250,0.95), rgba(250,250,250,1));
 }
 
 div.catwatermark{
@@ -288,17 +305,17 @@ div.catwatermark{
 
 table.postablelines tr td {
 	line-height: unset;
-    padding-top: 3px;
-    padding-bottom: 3px;
+	padding-top: 3px;
+	padding-bottom: 3px;
 }
 
 .posinvoiceline td {
-    height: 40px !important;
-    background-color: var(--colorbacklineimpair1);
+	height: 40px !important;
+	background-color: var(--colorbacklineimpair1);
 }
 
 .postablelines td.linecolht {
-    line-height: 1.3em !important;
+	line-height: 1.3em !important;
 }
 
 div.paymentbordline
@@ -414,11 +431,11 @@ div.paymentbordline
 }
 
 tr.selected, tr.selected td {
-    /* font-weight: bold; */
+	/* font-weight: bold; */
 	background-color: rgb(240,230,210) !important;
 }
 .order {
-    color: limegreen;
+	color: limegreen;
 }
 
 .colorwhite {
@@ -442,13 +459,13 @@ tr.selected, tr.selected td {
 
 .centerinmiddle {
 	transform: translate(0,-50%);
-    position: relative;
-    top: 50%;
+	position: relative;
+	top: 50%;
 }
 .trunc {
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
 }
 
 p.description_content{
@@ -457,11 +474,11 @@ p.description_content{
 }
 div.description_content {
 	display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: <?php echo $conf->global->TAKEPOS_LINES_TO_SHOW; ?>;
-    overflow: hidden;
-    padding-left: 2px;
-    padding-right: 2px;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: <?php echo $conf->global->TAKEPOS_LINES_TO_SHOW; ?>;
+	overflow: hidden;
+	padding-left: 2px;
+	padding-right: 2px;
 }
 
 .header{
@@ -488,7 +505,7 @@ div.description_content {
 	height: 100%;
 }
 .topnav .tmenu {
-    display: block;
+	display: block;
 }
 
 .topnav a{
@@ -498,8 +515,8 @@ div.description_content {
 }
 .topnav .login_block_other a {
 	padding: 5px 10px;
-    margin-left: 4px;
-    font-size: 1.3em;
+	margin-left: 4px;
+	font-size: 1.3em;
 }
 
 @media screen and (max-width: 767px) {
@@ -515,8 +532,8 @@ div.description_content {
 
 .topnav-left a {
 	padding: 7px 4px 7px 4px;
-    margin: 8px;
-    margin-left: 4px;
+	margin: 8px;
+	margin-left: 4px;
 }
 .topnav-left a:hover, .topnav .login_block_other a:hover {
 	background-color: #ddd;
@@ -534,27 +551,27 @@ div.description_content {
 	border-bottom: none !important;
 	margin-left: 6px;
 	font-size: 1.3em;
-    max-width: 250px;
-    border-radius: 5px;
+	max-width: 250px;
+	border-radius: 5px;
 }
 
 div#moreinfo, div#infowarehouse {
-    color: #aaa;
-    padding: 0 8px 0 8px;
+	color: #aaa;
+	padding: 0 8px 0 8px;
 }
 
 .productprice {
-    position: absolute;
-    top: 5px;
-    right: 5px;
-    background: var(--colorbackhmenu1);
-    color: var(--colortextbackhmenu);
-    font-size: 2em;
-    padding: 5px;
-    border-radius: 2px;
-    opacity: 0.9;
-    padding-left: 8px;
-    padding-right: 8px;
+	position: absolute;
+	top: 5px;
+	right: 5px;
+	background: var(--colorbackhmenu1);
+	color: var(--colortextbackhmenu);
+	font-size: 2em;
+	padding: 5px;
+	border-radius: 2px;
+	opacity: 0.9;
+	padding-left: 8px;
+	padding-right: 8px;
 }
 
 
@@ -604,9 +621,9 @@ div#moreinfo, div#infowarehouse {
 
 @media screen and (max-width: 767px) {
 	.header {
-	    position: sticky;
-	    top: 0;
-	    z-index: 10;
+		position: sticky;
+		top: 0;
+		z-index: 10;
 	}
 
 	.topnav input[type="text"] {
@@ -634,7 +651,7 @@ div#moreinfo, div#infowarehouse {
 	}
 
 	div#moreinfo, div#infowarehouse {
-	    padding: 0 5px 0 5px;
+		padding: 0 5px 0 5px;
 	}
 
 	div.div1 {
@@ -659,7 +676,7 @@ div#moreinfo, div#infowarehouse {
 	}
 
 	button.calcbutton, button.calcbutton2 {
-	    min-height: 30px;
+		min-height: 30px;
 	}
 
 	.takepospay {
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 72f25a86ce4..92d7e8288e1 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -25,11 +25,21 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -37,7 +47,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk"));
 
 $floor = GETPOST('floor', 'int');
-if ($floor == "") $floor = 1;
+if ($floor == "") {
+	$floor = 1;
+}
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $left = GETPOST('left', 'alpha');
@@ -57,38 +69,45 @@ if (empty($user->rights->takepos->run)) {
  * Actions
  */
 
-if ($action == "getTables")
-{
+if ($action == "getTables") {
 	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables where floor=".$floor;
 	$resql = $db->query($sql);
 	$rows = array();
 	while ($row = $db->fetch_array($resql)) {
 		$invoice = new Facture($db);
 		$result = $invoice->fetch('', '(PROV-POS'.$_SESSION['takeposterminal'].'-'.$row['rowid'].')');
-		if ($result > 0) $row['occupied'] = "red";
+		if ($result > 0) {
+			$row['occupied'] = "red";
+		}
 		$rows[] = $row;
 	}
 	echo json_encode($rows);
 	exit;
 }
 
-if ($action == "update")
-{
-	if ($left > 95) $left = 95;
-	if ($top > 95) $top = 95;
-	if ($left > 3 or $top > 4) $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=".$left.", toppos=".$top." WHERE rowid='".$place."'");
-	else $db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid='".$place."'");
+if ($action == "update") {
+	if ($left > 95) {
+		$left = 95;
+	}
+	if ($top > 95) {
+		$top = 95;
+	}
+	if ($left > 3 or $top > 4) {
+		$db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set leftpos=".$left.", toppos=".$top." WHERE rowid='".$place."'");
+	} else {
+		$db->query("DELETE from ".MAIN_DB_PREFIX."takepos_floor_tables where rowid='".$place."'");
+	}
 }
 
-if ($action == "updatename")
-{
+if ($action == "updatename") {
 	$newname = preg_replace("/[^a-zA-Z0-9\s]/", "", $newname); // Only English chars
-	if (strlen($newname) > 3) $newname = substr($newname, 0, 3); // Only 3 chars
+	if (strlen($newname) > 3) {
+		$newname = substr($newname, 0, 3); // Only 3 chars
+	}
 	$db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid='".$place."'");
 }
 
-if ($action == "add")
-{
+if ($action == "add") {
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."takepos_floor_tables(entity, label, leftpos, toppos, floor) VALUES (".$conf->entity.", '', '45', '45', ".$floor.")";
 	$asdf = $db->query($sql);
 	$db->query("update ".MAIN_DB_PREFIX."takepos_floor_tables set label=rowid where label=''"); // No empty table names
@@ -101,7 +120,9 @@ if ($action == "add")
 
 // Title
 $title = 'TakePOS - Dolibarr '.DOL_VERSION;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	$title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+}
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 ?>
 <link rel="stylesheet" href="css/pos.css.php?a=xxx">
@@ -159,14 +180,14 @@ function LoadPlace(place){
 
 $( document ).ready(function() {
 	$.getJSON('./floors.php?action=getTables&floor=<?php echo $floor; ?>', function(data) {
-        $.each(data, function(key, val) {
+		$.each(data, function(key, val) {
 			<?php if ($mode == "edit") {?>
 			$('body').append('<div class="tablediv" contenteditable onblur="updatename('+val.rowid+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="tablename'+val.rowid+'">'+val.label+'</div>');
 			$( "#tablename"+val.rowid ).draggable(
 				{
 					start: function() {
 					$("#add").html("<?php echo $langs->trans("Delete"); ?>");
-                    },
+					},
 					stop: function() {
 					var left=$(this).offset().left*100/$(window).width();
 					var top=$(this).offset().top*100/$(window).height();
@@ -190,25 +211,29 @@ $( document ).ready(function() {
 <body style="overflow: hidden">
 <?php if ($user->admin) {?>
 <div style="position: absolute; left: 0.1%; top: 0.8%; width:8%; height:11%;">
-    <?php if ($mode == "edit") {?>
+	<?php if ($mode == "edit") {?>
 <a id="add" onclick="window.location.href='floors.php?mode=edit&action=add&floor=<?php echo $floor; ?>';"><?php echo $langs->trans("AddTable"); ?></a>
-    <?php } else { ?>
+	<?php } else { ?>
 <a onclick="window.location.href='floors.php?mode=edit&floor=<?php echo $floor; ?>';"><?php echo $langs->trans("Edit"); ?></a>
-    <?php } ?>
+	<?php } ?>
 </div>
 <?php }
 ?>
 
 <div style="position: absolute; left: 25%; bottom: 8%; width:50%; height:3%;">
-    <center>
-    <h1>
-    <?php if ($floor > 1) { ?>
-    <img class="valignmiddle" src="./img/arrow-prev.png" width="5%" onclick="location.href='floors.php?floor=<?php if ($floor > 1) { $floor--; echo $floor; $floor++; } else echo "1"; ?>';">
-    <?php } ?>
-    <span class="valignmiddle"><?php echo $langs->trans("Floor")." ".$floor; ?></span>
-    <img src="./img/arrow-next.png" class="valignmiddle" width="5%" onclick="location.href='floors.php?floor=<?php $floor++; echo $floor; ?>';">
-    </h1>
-    </center>
+	<center>
+	<h1>
+	<?php if ($floor > 1) { ?>
+	<img class="valignmiddle" src="./img/arrow-prev.png" width="5%" onclick="location.href='floors.php?floor=<?php if ($floor > 1) {
+		$floor--; echo $floor; $floor++;
+																											 } else {
+																												 echo "1";
+																											 } ?>';">
+	<?php } ?>
+	<span class="valignmiddle"><?php echo $langs->trans("Floor")." ".$floor; ?></span>
+	<img src="./img/arrow-next.png" class="valignmiddle" width="5%" onclick="location.href='floors.php?floor=<?php $floor++; echo $floor; ?>';">
+	</h1>
+	</center>
 </div>
 </body>
 </html>
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index f8ed00c5590..7c1db7a84a3 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -26,11 +26,21 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
@@ -61,8 +71,11 @@ if ($place > 0) {
 // get default vat rate
 $constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION['takeposterminal'];
 $soc = new Societe($db);
-if ($invoice->socid > 0) $soc->fetch($invoice->socid);
-else $soc->fetch($conf->global->$constforcompanyid);
+if ($invoice->socid > 0) {
+	$soc->fetch($invoice->socid);
+} else {
+	$soc->fetch($conf->global->$constforcompanyid);
+}
 $vatRateDefault = get_default_tva($mysoc, $soc);
 
 /*
@@ -109,8 +122,12 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 <center>
 <input type="text" id="desc" name="desc" class="takepospay" style="width:40%;" placeholder="<?php echo $langs->trans('Description'); ?>">
 <?php
-if ($action == "freezone") echo '<input type="text" id="number" name="number" class="takepospay" style="width:15%;" placeholder="'.$langs->trans('Price').'">';
-if ($action == "addnote") echo '<input type="hidden" id="number" name="number" value="'.$idline.'">';
+if ($action == "freezone") {
+	echo '<input type="text" id="number" name="number" class="takepospay" style="width:15%;" placeholder="'.$langs->trans('Price').'">';
+}
+if ($action == "addnote") {
+	echo '<input type="hidden" id="number" name="number" value="'.$idline.'">';
+}
 ?>
 <input type="hidden" name="place" class="takepospay" value="<?php echo $place; ?>">
 <input type="button" class="button takepospay clearboth" value="OK" onclick="Save();">
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index bdd237d1a15..2725b0c8e87 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -17,15 +17,29 @@
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-if (!defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
-if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../../main.inc.php'; // Load $user and permissions
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	require '../../main.inc.php'; // Load $user and permissions
+}
 
 $id = GETPOST('id', 'int');
 $w = GETPOST('w', 'int');
@@ -38,8 +52,7 @@ $query = GETPOST('query', 'alpha');
  * View
  */
 
-if ($query == "cat")
-{
+if ($query == "cat") {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
 
@@ -50,10 +63,8 @@ if ($query == "cat")
 	$pdir = get_exdir($object->id, 2, 0, 0, $object, 'category').$object->id."/photos/";
 	$dir = $upload_dir.'/'.$pdir;
 
-	foreach ($object->liste_photos($dir) as $key => $obj)
-	{
-		if ($obj['photo_vignette'])
-		{
+	foreach ($object->liste_photos($dir) as $key => $obj) {
+		if ($obj['photo_vignette']) {
 			$filename = $obj['photo_vignette'];
 		} else {
 			$filename = $obj['photo'];
@@ -63,8 +74,7 @@ if ($query == "cat")
 		exit;
 	}
 	header('Location: ../../public/theme/common/nophoto.png');
-} elseif ($query == "pro")
-{
+} elseif ($query == "pro") {
 	require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
 	$objProd = new Product($db);
diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index 452eb7023e2..0fae2c3e25f 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -15,14 +15,30 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined("NOLOGIN"))       define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
-if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-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 (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+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 (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../../main.inc.php'; // Load $user and permissions
 require '../../core/modules/barcode/doc/tcpdfbarcode.modules.php';
@@ -34,8 +50,7 @@ if (GETPOSTISSET("key")) {
 	$key = GETPOST('key');
 	$module = new modTcpdfbarcode();
 	$result = $module->buildBarCode($urlwithroot."/takepos/public/auto_order.php?key=".$key, 'QRCODE', 'Y');
-}
-else {
+} else {
 	$module = new modTcpdfbarcode();
 	$result = $module->buildBarCode($urlwithroot."/takepos/public/menu.php", 'QRCODE', 'Y');
 }
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 6e6bdfa1957..432afdea73a 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -27,11 +27,21 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -47,20 +57,20 @@ $action = GETPOST('action', 'aZ09');
 $setterminal = GETPOST('setterminal', 'int');
 $setcurrency = GETPOST('setcurrency', 'aZ09');
 
-if ($_SESSION["takeposterminal"] == "")
-{
-	if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1; // Use terminal 1 if there is only 1 terminal
-	elseif (!empty($_COOKIE["takeposterminal"])) $_SESSION["takeposterminal"] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE["takeposterminal"]); // Restore takeposterminal from previous session
+if ($_SESSION["takeposterminal"] == "") {
+	if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") {
+		$_SESSION["takeposterminal"] = 1; // Use terminal 1 if there is only 1 terminal
+	} elseif (!empty($_COOKIE["takeposterminal"])) {
+		$_SESSION["takeposterminal"] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE["takeposterminal"]); // Restore takeposterminal from previous session
+	}
 }
 
-if ($setterminal > 0)
-{
+if ($setterminal > 0) {
 	$_SESSION["takeposterminal"] = $setterminal;
 	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, false, true); // Permanent takeposterminal var in a cookie
 }
 
-if ($setcurrency != "")
-{
+if ($setcurrency != "") {
 	$_SESSION["takeposcustomercurrency"] = $setcurrency;
 }
 
@@ -72,13 +82,11 @@ $categorie = new Categorie($db);
 
 $maxcategbydefaultforthisdevice = 12;
 $maxproductbydefaultforthisdevice = 24;
-if ($conf->browser->layout == 'phone')
-{
+if ($conf->browser->layout == 'phone') {
 	$maxcategbydefaultforthisdevice = 8;
 	$maxproductbydefaultforthisdevice = 16;
 	//REDIRECT TO BASIC LAYOUT IF TERMINAL SELECTED AND BASIC MOBILE LAYOUT ENABLED
-	if ($_SESSION["takeposterminal"] != "" && $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1)
-	{
+	if ($_SESSION["takeposterminal"] != "" && $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1) {
 		$_SESSION["basiclayout"] = 1;
 		header("Location: phone.php?mobilepage=invoice");
 		exit;
@@ -107,7 +115,9 @@ $form = new Form($db);
 
 // Title
 $title = 'TakePOS - Dolibarr '.DOL_VERSION;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	$title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+}
 $head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
@@ -118,7 +128,9 @@ top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 <link rel="stylesheet" href="css/pos.css.php">
 <link rel="stylesheet" href="css/colorbox.css" type="text/css" media="screen" />
 <?php
-if ($conf->global->TAKEPOS_COLOR_THEME == 1) print '<link rel="stylesheet" href="css/colorful.css">';
+if ($conf->global->TAKEPOS_COLOR_THEME == 1) {
+	print '<link rel="stylesheet" href="css/colorful.css">';
+}
 ?>
 <script type="text/javascript" src="js/jquery.colorbox-min.js"></script>	<!-- TODO It seems we don't need this -->
 <script language="javascript">
@@ -129,12 +141,9 @@ $categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT
 // Search root category to know its level
 //$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
 $levelofrootcategory = 0;
-if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
-{
-	foreach ($categories as $key => $categorycursor)
-	{
-		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-		{
+if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {
+	foreach ($categories as $key => $categorycursor) {
+		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID) {
 			$levelofrootcategory = $categorycursor['level'];
 			break;
 		}
@@ -145,10 +154,8 @@ $levelofmaincategories = $levelofrootcategory + 1;
 
 $maincategories = array();
 $subcategories = array();
-foreach ($categories as $key => $categorycursor)
-{
-	if ($categorycursor['level'] == $levelofmaincategories)
-	{
+foreach ($categories as $key => $categorycursor) {
+	if ($categorycursor['level'] == $levelofmaincategories) {
 		$maincategories[$key] = $categorycursor;
 	} else {
 		$subcategories[$key] = $categorycursor;
@@ -175,16 +182,16 @@ var invoiceid=0;
 var app = this;
 app.hasKeyboard = false;
 this.keyboardPress = function() {
-    app.hasKeyboard = true;
-    $(window).unbind("keyup", app.keyboardPress);
-    localStorage.hasKeyboard = true;
-    console.log("has keyboard!")
+	app.hasKeyboard = true;
+	$(window).unbind("keyup", app.keyboardPress);
+	localStorage.hasKeyboard = true;
+	console.log("has keyboard!")
 }
 $(window).on("keyup", app.keyboardPress)
 if(localStorage.hasKeyboard) {
-    app.hasKeyboard = true;
-    $(window).unbind("keyup", app.keyboardPress);
-    console.log("has keyboard from localStorage")
+	app.hasKeyboard = true;
+	$(window).unbind("keyup", app.keyboardPress);
+	console.log("has keyboard from localStorage")
 }
 */
 
@@ -219,8 +226,8 @@ function PrintCategories(first) {
 		}
 		$("#catdivdesc"+i).show();
 		$("#catdesc"+i).text(categories[parseInt(i)+parseInt(first)]['label']);
-        $("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[parseInt(i)+parseInt(first)]['rowid']);
-        $("#catdiv"+i).data("rowid",categories[parseInt(i)+parseInt(first)]['rowid']);
+		$("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[parseInt(i)+parseInt(first)]['rowid']);
+		$("#catdiv"+i).data("rowid",categories[parseInt(i)+parseInt(first)]['rowid']);
 		$("#catdiv"+i).attr('class', 'wrapper');
 		$("#catwatermark"+i).show();
 	}
@@ -253,8 +260,8 @@ function MoreCategories(moreorless) {
 		}
 		$("#catdivdesc"+i).show();
 		$("#catdesc"+i).text(categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['label']);
-        $("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
-        $("#catdiv"+i).data("rowid",categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
+		$("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
+		$("#catdiv"+i).data("rowid",categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
 		$("#catwatermark"+i).show();
 	}
 
@@ -274,7 +281,7 @@ function LoadProducts(position, issubcat) {
 		if (issubcat==true) currentcat=$('#prodiv'+position).data('rowid');
 		else currentcat=$('#catdiv'+position).data('rowid');
 	}
-    if (currentcat == undefined) return;
+	if (currentcat == undefined) return;
 	pageproducts=0;
 	ishow=0; //product to show counter
 
@@ -300,8 +307,7 @@ function LoadProducts(position, issubcat) {
 			//console.log("ishow"+ishow+" idata="+idata);
 			console.log(data[idata]);
 			if (typeof (data[idata]) == "undefined") {
-				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES)
-				{
+				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
 					echo '$("#prodivdesc"+ishow).hide();';
 					echo '$("#prodesc"+ishow).text("");';
 					echo '$("#proimg"+ishow).attr("title","");';
@@ -323,14 +329,12 @@ function LoadProducts(position, issubcat) {
 					$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[idata]['barcode']";
 				?>
 				var titlestring = <?php echo $titlestring; ?>;
-				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES)
-				{
+				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
 					echo '$("#prodivdesc"+ishow).show();';
 					echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);';
 					echo '$("#proimg"+ishow).attr("title", titlestring);';
 					echo '$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata][\'id\']);';
-				}
-				else {
+				} else {
 					echo '$("#probutton"+ishow).show();';
 					echo '$("#probutton"+ishow).text(data[parseInt(idata)][\'label\']);';
 				}
@@ -411,7 +415,7 @@ function MoreProducts(moreorless) {
 
 function ClickProduct(position) {
 	console.log("ClickProduct");
-    $('#proimg'+position).animate({opacity: '0.5'}, 1);
+	$('#proimg'+position).animate({opacity: '0.5'}, 1);
 	$('#proimg'+position).animate({opacity: '1'}, 100);
 	if ($('#prodiv'+position).data('iscat')==1){
 		console.log("Click on a category at position "+position);
@@ -454,8 +458,8 @@ function Customer() {
 
 function History()
 {
-    console.log("Open box to select the history");
-    $.colorbox({href:"../compta/facture/list.php?contextpage=poslist", width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("History"); ?>"});
+	console.log("Open box to select the history");
+	$.colorbox({href:"../compta/facture/list.php?contextpage=poslist", width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("History"); ?>"});
 }
 
 function Reduction() {
@@ -593,83 +597,83 @@ function Edit(number) {
 
 	if (typeof(selectedtext) == "undefined") return;	// We click on an action on the number pad but there is no line selected
 
-    var text=selectedtext+"<br> ";
+	var text=selectedtext+"<br> ";
 
-    if (number=='c'){
-        editnumber="";
-        Refresh();
-        return;
-    }
-    else if (number=='qty'){
-    	console.log("Edit "+number);
-        if (editaction=='qty' && editnumber!=""){
-            $("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
-                editnumber="";
-                //$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
-                $("#qty").html("<?php echo $langs->trans("Qty"); ?>");
-            });
+	if (number=='c'){
+		editnumber="";
+		Refresh();
+		return;
+	}
+	else if (number=='qty'){
+		console.log("Edit "+number);
+		if (editaction=='qty' && editnumber!=""){
+			$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
+				editnumber="";
+				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
+				$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
+			});
 
-            setFocusOnSearchField();
-            return;
-        }
-        else {
-            editaction="qty";
-        }
-    }
-    else if (number=='p'){
-    	console.log("Edit "+number);
-        if (editaction=='p' && editnumber!=""){
-            $("#poslines").load("invoice.php?action=updateprice&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
-                editnumber="";
-                //$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
-                $("#price").html("<?php echo $langs->trans("Price"); ?>");
-            });
+			setFocusOnSearchField();
+			return;
+		}
+		else {
+			editaction="qty";
+		}
+	}
+	else if (number=='p'){
+		console.log("Edit "+number);
+		if (editaction=='p' && editnumber!=""){
+			$("#poslines").load("invoice.php?action=updateprice&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
+				editnumber="";
+				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
+				$("#price").html("<?php echo $langs->trans("Price"); ?>");
+			});
 
-            ClearSearch();
-            return;
-        }
-        else {
-            editaction="p";
-        }
-    }
-    else if (number=='r'){
-    	console.log("Edit "+number);
-        if (editaction=='r' && editnumber!=""){
-            $("#poslines").load("invoice.php?action=updatereduction&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
-                editnumber="";
-                //$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
-                $("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
-            });
+			ClearSearch();
+			return;
+		}
+		else {
+			editaction="p";
+		}
+	}
+	else if (number=='r'){
+		console.log("Edit "+number);
+		if (editaction=='r' && editnumber!=""){
+			$("#poslines").load("invoice.php?action=updatereduction&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
+				editnumber="";
+				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
+				$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+			});
 
-            ClearSearch();
-            return;
-        }
-        else {
-            editaction="r";
-        }
-    }
-    else {
-        editnumber=editnumber+number;
-    }
-    if (editaction=='qty'){
-        text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("Qty").": "; ?>";
-        $("#qty").html("OK");
-        $("#price").html("<?php echo $langs->trans("Price"); ?>");
-        $("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
-    }
-    if (editaction=='p'){
-        text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("Price").": "; ?>";
-        $("#qty").html("<?php echo $langs->trans("Qty"); ?>");
-        $("#price").html("OK");
-        $("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
-    }
-    if (editaction=='r'){
-        text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("ReductionShort").": "; ?>";
-        $("#qty").html("<?php echo $langs->trans("Qty"); ?>");
-        $("#price").html("<?php echo $langs->trans("Price"); ?>");
-        $("#reduction").html("OK");
-    }
-    $('#'+selectedline).find("td:first").html(text+editnumber);
+			ClearSearch();
+			return;
+		}
+		else {
+			editaction="r";
+		}
+	}
+	else {
+		editnumber=editnumber+number;
+	}
+	if (editaction=='qty'){
+		text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("Qty").": "; ?>";
+		$("#qty").html("OK");
+		$("#price").html("<?php echo $langs->trans("Price"); ?>");
+		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+	}
+	if (editaction=='p'){
+		text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("Price").": "; ?>";
+		$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
+		$("#price").html("OK");
+		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+	}
+	if (editaction=='r'){
+		text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("ReductionShort").": "; ?>";
+		$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
+		$("#price").html("<?php echo $langs->trans("Price"); ?>");
+		$("#reduction").html("OK");
+	}
+	$('#'+selectedline).find("td:first").html(text+editnumber);
 }
 
 function TakeposPrintingOrder(){
@@ -691,8 +695,11 @@ function OpenDrawer(){
 	$.ajax({
 		type: "POST",
 		<?php
-		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) echo "url: '".$conf->global->TAKEPOS_PRINT_SERVER."/printer/drawer.php',";
-		else echo "url: 'http://".$conf->global->TAKEPOS_PRINT_SERVER.":8111/print',";
+		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+			echo "url: '".$conf->global->TAKEPOS_PRINT_SERVER."/printer/drawer.php',";
+		} else {
+			echo "url: 'http://".$conf->global->TAKEPOS_PRINT_SERVER.":8111/print',";
+		}
 		?>
 		data: "opendrawer"
 	});
@@ -725,23 +732,23 @@ function MoreActions(totalactions){
 
 function ControlCashOpening()
 {
-    $.colorbox({href:"../compta/cashcontrol/cashcontrol_card.php?action=create&contextpage=takepos", width:"90%", height:"60%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("NewCashFence"); ?>"});
+	$.colorbox({href:"../compta/cashcontrol/cashcontrol_card.php?action=create&contextpage=takepos", width:"90%", height:"60%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("NewCashFence"); ?>"});
 }
 
 function CloseCashFence(rowid)
 {
-    $.colorbox({href:"../compta/cashcontrol/cashcontrol_card.php?id="+rowid+"&contextpage=takepos", width:"90%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("NewCashFence"); ?>"});
+	$.colorbox({href:"../compta/cashcontrol/cashcontrol_card.php?id="+rowid+"&contextpage=takepos", width:"90%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("NewCashFence"); ?>"});
 }
 
 function CashReport(rowid)
 {
-    $.colorbox({href:"../compta/cashcontrol/report.php?id="+rowid+"&contextpage=takepos", width:"60%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("CashReport"); ?>"});
+	$.colorbox({href:"../compta/cashcontrol/report.php?id="+rowid+"&contextpage=takepos", width:"60%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("CashReport"); ?>"});
 }
 
 // TakePOS Popup
 function ModalBox(ModalID)
 {
-    var modal = document.getElementById(ModalID);
+	var modal = document.getElementById(ModalID);
 	modal.style.display = "block";
 }
 
@@ -757,36 +764,37 @@ function FullScreen() {
 
 function WeighingScale(){
 	console.log("Weighing Scale");
-    $.ajax({
-        type: "POST",
-        url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/scale/index.php',
-    })
+	$.ajax({
+		type: "POST",
+		url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/scale/index.php',
+	})
 	.done(function( editnumber ) {
 		$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
-                editnumber="";
-            });
+				editnumber="";
+			});
 	});
 }
 
 $( document ).ready(function() {
-    PrintCategories(0);
+	PrintCategories(0);
 	LoadProducts(0);
 	Refresh();
 	<?php
 	//IF NO TERMINAL SELECTED
-	if ($_SESSION["takeposterminal"] == "")
-	{
+	if ($_SESSION["takeposterminal"] == "") {
 		print "ModalBox('ModalTerminal');";
 	}
 	if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING) {
-	    $sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
-	    $sql .= " entity = ".$conf->entity." AND ";
-	    $sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
+		$sql = "SELECT rowid, status FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE";
+		$sql .= " entity = ".$conf->entity." AND ";
+		$sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			// If there is no cash control from today open it
-			if ($obj->rowid == null) print "ControlCashOpening();";
+			if ($obj->rowid == null) {
+				print "ControlCashOpening();";
+			}
 		}
 	}
 	?>
@@ -812,8 +820,11 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			<?php echo $langs->trans("Terminal"); ?>
 			</span>
 			<?php echo " ";
-			if ($_SESSION["takeposterminal"] == "") echo "1";
-			else echo $_SESSION["takeposterminal"];
+			if ($_SESSION["takeposterminal"] == "") {
+				echo "1";
+			} else {
+				echo $_SESSION["takeposterminal"];
+			}
 			echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
 			?>
 			</a>
@@ -863,8 +874,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	<div class="modal-body">
 		<button type="button" class="block" onclick="location.href='index.php?setterminal=1'"><?php print $langs->trans("Terminal"); ?> 1</button>
 		<?php
-		for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++)
-		{
+		for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++) {
 			print '<button type="button" class="block" onclick="location.href=\'index.php?setterminal='.$i.'\'">'.$langs->trans("Terminal").' '.$i.'</button>';
 		}
 		?>
@@ -885,10 +895,10 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
 			$sql .= " WHERE entity IN ('".getEntity('multicurrency')."')";
 			$resql = $db->query($sql);
-			if ($resql)
-			{
-				while ($obj = $db->fetch_object($resql))
-				print '<button type="button" class="block" onclick="location.href=\'index.php?setcurrency='.$obj->code.'\'">'.$obj->code.'</button>';
+			if ($resql) {
+				while ($obj = $db->fetch_object($resql)) {
+					print '<button type="button" class="block" onclick="location.href=\'index.php?setcurrency='.$obj->code.'\'">'.$obj->code.'</button>';
+				}
 			}
 			?>
 		</div>
@@ -910,7 +920,9 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 </div>
 </div>
 
-	<div class="row1<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) print 'withhead'; ?>">
+	<div class="row1<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
+		print 'withhead';
+					} ?>">
 
 		<div id="poslines" class="div1">
 		</div>
@@ -947,12 +959,18 @@ $paiementsModes = array();
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
 		$paycode = $obj->code;
-		if ($paycode == 'LIQ') $paycode = 'CASH';
-		if ($paycode == 'CHQ') $paycode = 'CHEQUE';
+		if ($paycode == 'LIQ') {
+			$paycode = 'CASH';
+		}
+		if ($paycode == 'CHQ') {
+			$paycode = 'CHEQUE';
+		}
 
 		$constantforkey = "CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
 		//var_dump($constantforkey.' '.$conf->global->$constantforkey);
-		if (!empty($conf->global->$constantforkey) && $conf->global->$constantforkey > 0) array_push($paiementsModes, $obj);
+		if (!empty($conf->global->$constantforkey) && $conf->global->$constantforkey > 0) {
+			array_push($paiementsModes, $obj);
+		}
 	}
 }
 
@@ -974,8 +992,7 @@ if (count($maincategories) == 0) {
 $menus = array();
 $r = 0;
 
-if (empty($conf->global->TAKEPOS_BAR_RESTAURANT))
-{
+if (empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
 	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("New").'</div>', 'action'=>'New();');
 } else {
 	// BAR RESTAURANT specific menu
@@ -995,30 +1012,28 @@ if ($conf->global->TAKEPOS_DIRECT_PAYMENT) {
 }
 
 // BAR RESTAURANT specific menu
-if ($conf->global->TAKEPOS_BAR_RESTAURANT)
-{
-	if ($conf->global->TAKEPOS_ORDER_PRINTERS)
-	{
+if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+	if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
 		$menus[$r++] = array('title'=>$langs->trans("Order"), 'action'=>'TakeposPrintingOrder();');
 	}
 	//Button to print receipt before payment
-	if ($conf->global->TAKEPOS_BAR_RESTAURANT)
-	{
+	if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 		if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
-			if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposConnector(placeid);');
-			else $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposPrinting(placeid);');
+			if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+				$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposConnector(placeid);');
+			} else {
+				$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposPrinting(placeid);');
+			}
 		} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 			$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'DolibarrTakeposPrinting(placeid);');
 		} else {
 			$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'Print(placeid);');
 		}
 	}
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && $conf->global->TAKEPOS_ORDER_NOTES == 1)
-	{
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && $conf->global->TAKEPOS_ORDER_NOTES == 1) {
 		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("OrderNotes").'</div>', 'action'=>'TakeposOrderNotes();');
 	}
-	if ($conf->global->TAKEPOS_SUPPLEMENTS)
-	{
+	if ($conf->global->TAKEPOS_SUPPLEMENTS) {
 		$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("ProductSupplements").'</div>', 'action'=>'LoadProducts(\'supplements\');');
 	}
 }
@@ -1037,14 +1052,14 @@ $sql = "SELECT rowid, status, entity FROM ".MAIN_DB_PREFIX."pos_cash_fence WHERE
 $sql .= " entity = ".$conf->entity." AND ";
 $sql .= " date_creation > '".$db->idate(dol_get_first_hour(dol_now()))."'";
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$obj = $db->fetch_object($resql);
 		$menus[$r++] = array('title'=>'<span class="fas fa-file-invoice-dollar paddingrightonly"></span><div class="trunc">'.$langs->trans("CashReport").'</div>', 'action'=>'CashReport('.$obj->rowid.');');
-		if ($obj->status == 0) $menus[$r++] = array('title'=>'<span class="fas fa-cash-register paddingrightonly"></span><div class="trunc">'.$langs->trans("CloseCashFence").'</div>', 'action'=>'CloseCashFence('.$obj->rowid.');');
+		if ($obj->status == 0) {
+			$menus[$r++] = array('title'=>'<span class="fas fa-cash-register paddingrightonly"></span><div class="trunc">'.$langs->trans("CloseCashFence").'</div>', 'action'=>'CloseCashFence('.$obj->rowid.');');
+		}
 	}
 }
 
@@ -1060,14 +1075,15 @@ if (!empty($reshook)) {
 	}
 }
 
-if ($r % 3 == 2) $menus[$r++] = array('title'=>'', 'style'=>'visibility: hidden;');
+if ($r % 3 == 2) {
+	$menus[$r++] = array('title'=>'', 'style'=>'visibility: hidden;');
+}
 
 if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	$menus[$r++] = array('title'=>'<span class="fa fa-sign-out-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Logout").'</div>', 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
 }
 
-if ($conf->global->TAKEPOS_WEIGHING_SCALE)
-{
+if ($conf->global->TAKEPOS_WEIGHING_SCALE) {
 	$menus[$r++] = array('title'=>'<span class="fa fa-balance-scale paddingrightonly"></span><div class="trunc">'.$langs->trans("WeighingScale").'</div>', 'action'=>'WeighingScale();');
 }
 
@@ -1076,15 +1092,16 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 		<div class="div3">
 		<?php
 		$i = 0;
-		foreach ($menus as $menu)
-		{
+		foreach ($menus as $menu) {
 			$i++;
-			if (count($menus) > 12 and $i == 12)
-			{
+			if (count($menus) > 12 and $i == 12) {
 				echo '<button style="'.$menu['style'].'" type="button" id="actionnext" class="actionbutton" onclick="MoreActions('.count($menus).');">'.$langs->trans("Next").'</button>';
 				echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-			} elseif ($i > 12) echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
-			else echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+			} elseif ($i > 12) {
+				echo '<button style="display: none;" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+			} else {
+				echo '<button style="'.$menu['style'].'" type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
+			}
 		}
 
 		if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
@@ -1098,16 +1115,23 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 		</div>
 	</div>
 
-	<div class="row2<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) print 'withhead'; ?>">
+	<div class="row2<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
+		print 'withhead';
+					} ?>">
 
 		<!--  Show categories -->
 		<div class="div4">
 	<?php
 	$count = 0;
-	while ($count < $MAXCATEG)
-	{
+	while ($count < $MAXCATEG) {
 		?>
-			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) echo 'onclick="MoreCategories(\'less\');"'; elseif ($count == ($MAXCATEG - 1)) echo 'onclick="MoreCategories(\'more\');"'; else echo 'onclick="LoadProducts('.$count.');"'; ?> id="catdiv<?php echo $count; ?>">
+			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) {
+				echo 'onclick="MoreCategories(\'less\');"';
+								 } elseif ($count == ($MAXCATEG - 1)) {
+									 echo 'onclick="MoreCategories(\'more\');"';
+								 } else {
+									 echo 'onclick="LoadProducts('.$count.');"';
+								 } ?> id="catdiv<?php echo $count; ?>">
 				<?php
 				if ($count == ($MAXCATEG - 2)) {
 					//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';
@@ -1116,7 +1140,9 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 					//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
 					echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
 				} else {
-					if (!$conf->global->TAKEPOS_HIDE_CATEGORY_IMAGES) echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
+					if (!$conf->global->TAKEPOS_HIDE_CATEGORY_IMAGES) {
+						echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
+					}
 				}
 				?>
 				<?php if ($count != ($MAXCATEG - 2) && $count != ($MAXCATEG - 1)) { ?>
@@ -1126,21 +1152,26 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 				<?php } ?>
 				<div class="catwatermark" id='catwatermark<?php echo $count; ?>'>...</div>
 			</div>
-	    <?php
+		<?php
 		$count++;
 	}
 	?>
 		</div>
 
-	    <!--  Show product -->
+		<!--  Show product -->
 		<div class="div5">
-    <?php
+	<?php
 	$count = 0;
-	while ($count < $MAXPRODUCT)
-	{
+	while ($count < $MAXPRODUCT) {
 		?>
-    			<div class="wrapper2" id='prodiv<?php echo $count; ?>' <?php if ($count == ($MAXPRODUCT - 2)) {?> onclick="MoreProducts('less');" <?php } if ($count == ($MAXPRODUCT - 1)) {?> onclick="MoreProducts('more');" <?php } else echo 'onclick="ClickProduct('.$count.');"'; ?>>
-    				<?php
+				<div class="wrapper2" id='prodiv<?php echo $count; ?>' <?php if ($count == ($MAXPRODUCT - 2)) {
+					?> onclick="MoreProducts('less');" <?php
+												} if ($count == ($MAXPRODUCT - 1)) {
+													?> onclick="MoreProducts('more');" <?php
+												} else {
+													echo 'onclick="ClickProduct('.$count.');"';
+												} ?>>
+					<?php
 					if ($count == ($MAXPRODUCT - 2)) {
 						//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
 						print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
@@ -1148,21 +1179,22 @@ if ($conf->global->TAKEPOS_WEIGHING_SCALE)
 						//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
 						print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
 					} else {
-						if ($conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) echo '<button type="button" id="probutton'.$count.'" class="productbutton" style="display: none;"></button>';
-						else {
+						if ($conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
+							echo '<button type="button" id="probutton'.$count.'" class="productbutton" style="display: none;"></button>';
+						} else {
 							print '<div class="" id="proprice'.$count.'"></div>';
 							print '<img class="imgwrapper" height="100%" title="" id="proimg'.$count.'">';
 						}
 					}
 					?>
 					<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1) && !$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) { ?>
-    				<div class="description" id="prodivdesc<?php echo $count; ?>">
-    					<div class="description_content" id="prodesc<?php echo $count; ?>"></div>
-    				</div>
-    				<?php } ?>
-    				<div class="catwatermark" id='prowatermark<?php echo $count; ?>'>...</div>
-    			</div>
-        <?php
+					<div class="description" id="prodivdesc<?php echo $count; ?>">
+						<div class="description_content" id="prodesc<?php echo $count; ?>"></div>
+					</div>
+					<?php } ?>
+					<div class="catwatermark" id='prowatermark<?php echo $count; ?>'>...</div>
+				</div>
+		<?php
 		$count++;
 	}
 	?>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index a1989c41bfa..f78d8d44811 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -27,13 +27,25 @@
 // if (! defined('NOREQUIREDB'))        define('NOREQUIREDB', '1');        // Not disabled cause need to load personalized language
 // if (! defined('NOREQUIRESOC'))        define('NOREQUIRESOC', '1');
 // if (! defined('NOREQUIRETRAN'))        define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK')) { define('NOCSRFCHECK', '1'); }
-if (!defined('NOTOKENRENEWAL')) { define('NOTOKENRENEWAL', '1'); }
-if (!defined('NOREQUIREMENU')) { define('NOREQUIREMENU', '1'); }
-if (!defined('NOREQUIREHTML')) { define('NOREQUIREHTML', '1'); }
-if (!defined('NOREQUIREAJAX')) { define('NOREQUIREAJAX', '1'); }
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
-if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	require '../main.inc.php';
+}
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -58,20 +70,21 @@ if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLI
  * View
  */
 
-if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))
-{
+if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	// DIRECT LINK TO THIS PAGE FROM MOBILE AND NO TERMINAL SELECTED
-	if ($_SESSION["takeposterminal"] == "")
-	{
-		if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1;
-		else {
+	if ($_SESSION["takeposterminal"] == "") {
+		if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") {
+			$_SESSION["takeposterminal"] = 1;
+		} else {
 			header("Location: ".DOL_URL_ROOT."/takepos/index.php");
 			exit;
 		}
 	}
 	$mobilepage = GETPOST('mobilepage', 'alpha');
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+		$title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	}
 	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="mobile-web-app-capable" content="yes">
@@ -108,9 +121,15 @@ $amountofpayment = price2num(GETPOST('amount', 'alpha'));
 $invoiceid = GETPOST('invoiceid', 'int');
 
 $paycode = $pay;
-if ($pay == 'cash')   $paycode = 'LIQ'; // For backward compatibility
-if ($pay == 'card')   $paycode = 'CB'; // For backward compatibility
-if ($pay == 'cheque') $paycode = 'CHQ'; // For backward compatibility
+if ($pay == 'cash') {
+	$paycode = 'LIQ'; // For backward compatibility
+}
+if ($pay == 'card') {
+	$paycode = 'CB'; // For backward compatibility
+}
+if ($pay == 'cheque') {
+	$paycode = 'CHQ'; // For backward compatibility
+}
 
 // Retrieve paiementid
 $sql = "SELECT id FROM ".MAIN_DB_PREFIX."c_paiement";
@@ -121,22 +140,23 @@ $obj = $db->fetch_object($resql);
 $paiementid = $obj->id;
 
 $invoice = new Facture($db);
-if ($invoiceid > 0)
-{
+if ($invoiceid > 0) {
 	$ret = $invoice->fetch($invoiceid);
 } else {
 	$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
 }
-if ($ret > 0)
-{
+if ($ret > 0) {
 	$placeid = $invoice->id;
 }
 
 $constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
 
 $soc = new Societe($db);
-if ($invoice->socid > 0) $soc->fetch($invoice->socid);
-else $soc->fetch($conf->global->$constforcompanyid);
+if ($invoice->socid > 0) {
+	$soc->fetch($invoice->socid);
+} else {
+	$soc->fetch($conf->global->$constforcompanyid);
+}
 
 
 /*
@@ -144,18 +164,20 @@ else $soc->fetch($conf->global->$constforcompanyid);
  */
 
 // Action to record a payment on a TakePOS invoice
-if ($action == 'valid' && $user->rights->facture->creer)
-{
+if ($action == 'valid' && $user->rights->facture->creer) {
 	$bankaccount = 0;
 	$error = 0;
 
 	if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
 		$bankaccount = GETPOST('accountid', 'int');
 	} else {
-		if ($pay == "cash") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
-		elseif ($pay == "card") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility
-		elseif ($pay == "cheque") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
-		else {
+		if ($pay == "cash") {
+			$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
+		} elseif ($pay == "card") {
+			$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility
+		} elseif ($pay == "cheque") {
+			$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
+		} else {
 			$accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
 			$bankaccount = $conf->global->$accountname;
 		}
@@ -253,11 +275,15 @@ if ($action == 'valid' && $user->rights->facture->creer)
 			$payment->datepaye = $now;
 			$payment->fk_account = $bankaccount;
 			$payment->amounts[$invoice->id] = $amountofpayment;
-			if ($pay == 'cash') $payment->pos_change = price2num(GETPOST('excess', 'alpha'));
+			if ($pay == 'cash') {
+				$payment->pos_change = price2num(GETPOST('excess', 'alpha'));
+			}
 
 			// If user has not used change control, add total invoice payment
 			// Or if user has used change control and the amount of payment is higher than remain to pay, add the remain to pay
-			if ($amountofpayment == 0 || $amountofpayment > $remaintopay) $payment->amounts[$invoice->id] = $remaintopay;
+			if ($amountofpayment == 0 || $amountofpayment > $remaintopay) {
+				$payment->amounts[$invoice->id] = $remaintopay;
+			}
 
 			$payment->paiementid = $paiementid;
 			$payment->num_payment = $invoice->ref;
@@ -272,7 +298,9 @@ if ($action == 'valid' && $user->rights->facture->creer)
 		if ($remaintopay == 0) {
 			dol_syslog("Invoice is paid, so we set it to status Paid");
 			$result = $invoice->setPaid($user);
-			if ($result > 0) $invoice->paye = 1;
+			if ($result > 0) {
+				$invoice->paye = 1;
+			}
 			// set payment method
 			$invoice->setPaymentMethods($paiementid);
 		} else {
@@ -283,8 +311,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 	}
 }
 
-if ($action == 'creditnote')
-{
+if ($action == 'creditnote') {
 	$creditnote = new Facture($db);
 	$creditnote->socid = $invoice->socid;
 	$creditnote->date = dol_now();
@@ -294,8 +321,7 @@ if ($action == 'creditnote')
 	$creditnote->remise_percent = $invoice->remise_percent;
 	$creditnote->create($user);
 
-	foreach ($invoice->lines as $line)
-	{
+	foreach ($invoice->lines as $line) {
 		// Extrafields
 		if (method_exists($line, 'fetch_optionals')) {
 			// load extrafields
@@ -305,21 +331,17 @@ if ($action == 'creditnote')
 		if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
 			$fk_parent_line = 0;
 		}
-		if ($invoice->type == Facture::TYPE_SITUATION)
-		{
+		if ($invoice->type == Facture::TYPE_SITUATION) {
 			$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
 			$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
-			if (!empty($invoice->tab_previous_situation_invoice))
-			{
+			if (!empty($invoice->tab_previous_situation_invoice)) {
 				// search the last standard invoice in cycle and the possible credit note between this last and invoice
 				// TODO Move this out of loop of $invoice->lines
 				$tab_jumped_credit_notes = array();
 				$lineIndex = count($invoice->tab_previous_situation_invoice) - 1;
 				$searchPreviousInvoice = true;
-				while ($searchPreviousInvoice)
-				{
-					if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
-					{
+				while ($searchPreviousInvoice) {
+					if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1) {
 						$searchPreviousInvoice = false; // find, exit;
 						break;
 					} else {
@@ -331,10 +353,8 @@ if ($action == 'creditnote')
 				}
 
 				$maxPrevSituationPercent = 0;
-				foreach ($invoice->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
-				{
-					if ($prevLine->id == $source_fk_prev_id)
-					{
+				foreach ($invoice->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine) {
+					if ($prevLine->id == $source_fk_prev_id) {
 						$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
 
 						//$line->subprice  = $line->subprice - $prevLine->subprice;
@@ -359,10 +379,8 @@ if ($action == 'creditnote')
 				// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
 				$maxPrevSituationPercent = 0;
 				foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
-					foreach ($invoice->tab_previous_situation_invoice[$index]->lines as $prevLine)
-					{
-						if ($prevLine->fk_prev_id == $source_fk_prev_id)
-						{
+					foreach ($invoice->tab_previous_situation_invoice[$index]->lines as $prevLine) {
+						if ($prevLine->fk_prev_id == $source_fk_prev_id) {
 							$maxPrevSituationPercent = $prevLine->situation_percent;
 
 							$line->total_ht  -= $prevLine->total_ht;
@@ -431,10 +449,12 @@ if ($action == 'creditnote')
 	}
 }
 
-if ($action == 'history' || $action == 'creditnote')
-{
-	if ($action == 'creditnote') $placeid = $creditnote->id;
-	else $placeid = (int) GETPOST('placeid', 'int');
+if ($action == 'history' || $action == 'creditnote') {
+	if ($action == 'creditnote') {
+		$placeid = $creditnote->id;
+	} else {
+		$placeid = (int) GETPOST('placeid', 'int');
+	}
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
 }
@@ -443,22 +463,19 @@ if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"
 	$invoice->setMulticurrencyCode($_SESSION["takeposcustomercurrency"]);
 }
 
-if (($action == "addline" || $action == "freezone") && $placeid == 0)
-{
+if (($action == "addline" || $action == "freezone") && $placeid == 0) {
 	$invoice->socid = $conf->global->$constforcompanyid;
 	$invoice->date = dol_now();
 	$invoice->module_source = 'takepos';
 	$invoice->pos_source = $_SESSION["takeposterminal"];
 	$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
 
-	if ($invoice->socid <= 0)
-	{
+	if ($invoice->socid <= 0) {
 		$langs->load('errors');
 		dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
 	} else {
 		$placeid = $invoice->create($user);
-		if ($placeid < 0)
-		{
+		if ($placeid < 0) {
 			dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
 		}
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' where rowid=".$placeid;
@@ -466,8 +483,7 @@ if (($action == "addline" || $action == "freezone") && $placeid == 0)
 	}
 }
 
-if ($action == "addline")
-{
+if ($action == "addline") {
 	$prod = new Product($db);
 	$prod->fetch($idproduct);
 
@@ -487,19 +503,20 @@ if ($action == "addline")
 	$localtax1_tx = get_localtax($tva_tx, 1, $customer, $mysoc, $tva_npr);
 	$localtax2_tx = get_localtax($tva_tx, 2, $customer, $mysoc, $tva_npr);
 
-	if (!empty($conf->global->TAKEPOS_SUPPLEMENTS))
-	{
+	if (!empty($conf->global->TAKEPOS_SUPPLEMENTS)) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$cat = new Categorie($db);
 		$categories = $cat->containing($idproduct, 'product');
 		$found = (array_search($conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, array_column($categories, 'id')));
-		if ($found !== false) // If this product is a supplement
-		{
+		if ($found !== false) { // If this product is a supplement
 			$sql = "SELECT fk_parent_line FROM ".MAIN_DB_PREFIX."facturedet where rowid=$selectedline";
 			$resql = $db->query($sql);
 			$row = $db->fetch_array($resql);
-			if ($row[0] == null) $parent_line = $selectedline;
-			else $parent_line = $row[0]; //If the parent line is already a supplement, add the supplement to the main  product
+			if ($row[0] == null) {
+				$parent_line = $selectedline;
+			} else {
+				$parent_line = $row[0]; //If the parent line is already a supplement, add the supplement to the main  product
+			}
 		}
 	}
 
@@ -547,10 +564,8 @@ if ($action == "freezone") {
 }
 
 if ($action == "addnote") {
-	foreach ($invoice->lines as $line)
-	{
-		if ($line->id == $number)
-		{
+	foreach ($invoice->lines as $line) {
+		if ($line->id == $number) {
 			$line->array_options['order_notes'] = $desc;
 			$result = $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->fk_unit);
 		}
@@ -583,8 +598,7 @@ if ($action == "delete") {
 	if ($placeid > 0) {
 		$result = $invoice->fetch($placeid);
 
-		if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT)
-		{
+		if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT) {
 			$db->begin();
 
 			// We delete the lines
@@ -604,22 +618,19 @@ if ($action == "delete") {
 			$resql1 = $db->query($sql);
 
 			if ($resdeletelines && $resql1) {
-            	$db->commit();
-            } else {
-            	$db->rollback();
-            }
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
 
 			$invoice->fetch($placeid);
 		}
 	}
 }
 
-if ($action == "updateqty")
-{
-	foreach ($invoice->lines as $line)
-	{
-		if ($line->id == $idline)
-		{
+if ($action == "updateqty") {
+	foreach ($invoice->lines as $line) {
+		if ($line->id == $idline) {
 			$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $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);
 		}
 	}
@@ -627,12 +638,9 @@ if ($action == "updateqty")
 	$invoice->fetch($placeid);
 }
 
-if ($action == "updateprice")
-{
-	foreach ($invoice->lines as $line)
-	{
-		if ($line->id == $idline)
-		{
+if ($action == "updateprice") {
+	foreach ($invoice->lines as $line) {
+		if ($line->id == $idline) {
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
 			$customer = new Societe($db);
@@ -642,21 +650,19 @@ if ($action == "updateprice")
 			$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
 			$pu_ht = price2num($number / (1 + ($line->tva_tx / 100)), 'MU');
 			//Check min price
-			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min))))
-			{
+			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min)))) {
 				echo $langs->trans("CantBeLessThanMinPrice");
-			} else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $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);
+			} else {
+				$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $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);
+			}
 		}
 	}
 	$invoice->fetch($placeid);
 }
 
-if ($action == "updatereduction")
-{
-	foreach ($invoice->lines as $line)
-	{
-		if ($line->id == $idline)
-		{
+if ($action == "updatereduction") {
+	foreach ($invoice->lines as $line) {
+		if ($line->id == $idline) {
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
 			$customer = new Societe($db);
@@ -666,10 +672,11 @@ if ($action == "updatereduction")
 			$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
 			$pu_ht = price2num($line->multicurrency_subprice / (1 + ($line->tva_tx / 100)), 'MU');
 			//Check min price
-			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->multicurrency_subprice) * (1 - price2num($number) / 100) < price2num($price_min))))
-			{
+			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->multicurrency_subprice) * (1 - price2num($number) / 100) < price2num($price_min)))) {
 				echo $langs->trans("CantBeLessThanMinPrice");
-			} else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $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);
+			} else {
+				$result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $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);
+			}
 		}
 	}
 	$invoice->fetch($placeid);
@@ -681,8 +688,7 @@ if ($action == "updatereduction")
 	$invoice->fetch($placeid);
 }
 
-if ($action == "order" and $placeid != 0)
-{
+if ($action == "order" and $placeid != 0) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
@@ -700,8 +706,7 @@ if ($action == "order" and $placeid != 0)
 	$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
 	$catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
 	$catsprinter3 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_3);
-	foreach ($invoice->lines as $line)
-	{
+	foreach ($invoice->lines as $line) {
 		if ($line->special_code == "4") {
 			continue;
 		}
@@ -709,16 +714,23 @@ if ($action == "order" and $placeid != 0)
 		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
 		$result = array_intersect($catsprinter1, $existing);
 		$count = count($result);
-		if (!$line->fk_product) $count++; // Print Free-text item (Unassigned printer) to Printer 1
+		if (!$line->fk_product) {
+			$count++; // Print Free-text item (Unassigned printer) to Printer 1
+		}
 		if ($count > 0) {
 			$linestoprint++;
 			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='1' where rowid=".$line->id; //Set to print on printer 1
 			$db->query($sql);
 			$order_receipt_printer1 .= '<tr><td class="left">';
-			if ($line->fk_product) $order_receipt_printer1 .= $line->product_label;
-			else $order_receipt_printer1 .= $line->description;
+			if ($line->fk_product) {
+				$order_receipt_printer1 .= $line->product_label;
+			} else {
+				$order_receipt_printer1 .= $line->description;
+			}
 			$order_receipt_printer1 .= '</td><td class="right">'.$line->qty;
-			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer1 .= "<br>(".$line->array_options['options_order_notes'].")";
+			if (!empty($line->array_options['options_order_notes'])) {
+				$order_receipt_printer1 .= "<br>(".$line->array_options['options_order_notes'].")";
+			}
 			$order_receipt_printer1 .= '</td></tr>';
 		}
 	}
@@ -735,8 +747,7 @@ if ($action == "order" and $placeid != 0)
 	$invoice->fetch($placeid); //Reload object after set lines as printed
 	$linestoprint = 0;
 
-	foreach ($invoice->lines as $line)
-	{
+	foreach ($invoice->lines as $line) {
 		if ($line->special_code == "4") {
 			continue;
 		}
@@ -749,7 +760,9 @@ if ($action == "order" and $placeid != 0)
 			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='2' where rowid=".$line->id; //Set to print on printer 2
 			$db->query($sql);
 			$order_receipt_printer2 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
-			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer2 .= "<br>(".$line->array_options['options_order_notes'].")";
+			if (!empty($line->array_options['options_order_notes'])) {
+				$order_receipt_printer2 .= "<br>(".$line->array_options['options_order_notes'].")";
+			}
 			$order_receipt_printer2 .= '</td></tr>';
 		}
 	}
@@ -766,8 +779,7 @@ if ($action == "order" and $placeid != 0)
 	$invoice->fetch($placeid); //Reload object after set lines as printed
 	$linestoprint = 0;
 
-	foreach ($invoice->lines as $line)
-	{
+	foreach ($invoice->lines as $line) {
 		if ($line->special_code == "4") {
 			continue;
 		}
@@ -780,7 +792,9 @@ if ($action == "order" and $placeid != 0)
 			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=".$line->id; //Set to print on printer 3
 			$db->query($sql);
 			$order_receipt_printer3 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
-			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer3 .= "<br>(".$line->array_options['options_order_notes'].")";
+			if (!empty($line->array_options['options_order_notes'])) {
+				$order_receipt_printer3 .= "<br>(".$line->array_options['options_order_notes'].")";
+			}
 			$order_receipt_printer3 .= '</td></tr>';
 		}
 	}
@@ -798,23 +812,27 @@ if ($action == "order" and $placeid != 0)
 }
 
 $sectionwithinvoicelink = '';
-if ($action == "valid" || $action == "history" || $action == 'creditnote')
-{
+if ($action == "valid" || $action == "history" || $action == 'creditnote') {
 	$sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n";
 	$sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">';
 	$sectionwithinvoicelink .= $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, -1, '_backoffice')." - ";
 	$remaintopay = $invoice->getRemainToPay();
-	if ($remaintopay > 0)
-	{
+	if ($remaintopay > 0) {
 		$sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 	} else {
-		if ($invoice->paye) $sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
-		else $sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
+		if ($invoice->paye) {
+			$sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
+		} else {
+			$sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
+		}
 	}
 	$sectionwithinvoicelink .= '</span><br>';
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
-		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
-		else $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+		} else {
+			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+		}
 	} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="DolibarrTakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
 	} else {
@@ -823,12 +841,13 @@ if ($action == "valid" || $action == "history" || $action == 'creditnote')
 			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1);">'.$langs->trans('GiftReceipt').'</button>';
 		}
 	}
-	if ($conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0)
-	{
+	if ($conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0) {
 		$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.');">'.$langs->trans('SendTicket').'</button>';
 	}
 
-	if ($remaintopay <= 0 && $conf->global->TAKEPOS_AUTO_PRINT_TICKETS) $sectionwithinvoicelink .= '<script language="javascript">$("#buttonprint").click();</script>';
+	if ($remaintopay <= 0 && $conf->global->TAKEPOS_AUTO_PRINT_TICKETS) {
+		$sectionwithinvoicelink .= '<script language="javascript">$("#buttonprint").click();</script>';
+	}
 }
 
 /*
@@ -845,27 +864,27 @@ var placeid=<?php echo ($placeid > 0 ? $placeid : 0); ?>;
 $(document).ready(function() {
 	var idoflineadded = <?php echo ($idoflineadded ? $idoflineadded : 0); ?>;
 
-    $('.posinvoiceline').click(function(){
-    	console.log("Click done on "+this.id);
-        $('.posinvoiceline').removeClass("selected");
-        $(this).addClass("selected");
-        if (selectedline==this.id) return; // If is already selected
-        else selectedline=this.id;
-        selectedtext=$('#'+selectedline).find("td:first").html();
+	$('.posinvoiceline').click(function(){
+		console.log("Click done on "+this.id);
+		$('.posinvoiceline').removeClass("selected");
+		$(this).addClass("selected");
+		if (selectedline==this.id) return; // If is already selected
+		else selectedline=this.id;
+		selectedtext=$('#'+selectedline).find("td:first").html();
 		<?php
 		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 			print '$("#phonediv1").load("auto_order.php?action=editline&placeid="+placeid+"&selectedline="+selectedline, function() {
 			});';
 		}
 		?>
-    });
+	});
 
-    /* Autoselect the line */
-    if (idoflineadded > 0)
-    {
-        console.log("Auto select "+idoflineadded);
-        $('.posinvoiceline#'+idoflineadded).click();
-    }
+	/* Autoselect the line */
+	if (idoflineadded > 0)
+	{
+		console.log("Auto select "+idoflineadded);
+		$('.posinvoiceline#'+idoflineadded).click();
+	}
 <?php
 
 if ($action == "order" and $order_receipt_printer1 != "") {
@@ -877,8 +896,7 @@ if ($action == "order" and $order_receipt_printer1 != "") {
 			data: 'invoice='+orderprinter1esc
 		});
 		<?php
-	}
-	else {
+	} else {
 		?>
 		$.ajax({
 			type: "POST",
@@ -899,8 +917,7 @@ if ($action == "order" and $order_receipt_printer2 != "") {
 			data: 'invoice='+orderprinter2esc
 		});
 		<?php
-	}
-	else {
+	} else {
 		?>
 		$.ajax({
 			type: "POST",
@@ -908,7 +925,7 @@ if ($action == "order" and $order_receipt_printer2 != "") {
 			data: '<?php
 			print $headerorder.$order_receipt_printer2.$footerorder; ?>'
 		});
-    	<?php
+		<?php
 	}
 }
 
@@ -928,25 +945,25 @@ if ($action == "order" and $order_receipt_printer3 != "") {
 if ($action == "search" || $action == "valid") {
 	?>
 	parent.setFocusOnSearchField();
-    <?php
+	<?php
 }
 
 
 if ($action == "temp" and $ticket_printer1 != "") {
 	?>
-    $.ajax({
-        type: "POST",
-        url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
-        data: '<?php
+	$.ajax({
+		type: "POST",
+		url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
+		data: '<?php
 		print $header_soc.$header_ticket.$body_ticket.$ticket_printer1.$ticket_total.$footer_ticket; ?>'
-    });
-    <?php
+	});
+	<?php
 }
 
 if ($action == "search") {
 	?>
-    $('#search').focus();
-    <?php
+	$('#search').focus();
+	<?php
 }
 
 ?>
@@ -955,45 +972,45 @@ if ($action == "search") {
 
 function SendTicket(id)
 {
-    console.log("Open box to select the Print/Send form");
-    $.colorbox({href:"send.php?facid="+id, width:"70%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("SendTicket"); ?>"});
+	console.log("Open box to select the Print/Send form");
+	$.colorbox({href:"send.php?facid="+id, width:"70%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("SendTicket"); ?>"});
 }
 
 function Print(id, gift){
-    $.colorbox({href:"receipt.php?facid="+id+"&gift="+gift, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php
+	$.colorbox({href:"receipt.php?facid="+id+"&gift="+gift, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php
 	echo $langs->trans("PrintTicket"); ?>"});
 }
 
 function TakeposPrinting(id){
-    var receipt;
+	var receipt;
 	console.log("TakeposPrinting" + id);
-    $.get("receipt.php?facid="+id, function(data, status){
-        receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');
-        $.ajax({
-            type: "POST",
-            url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
-            data: receipt
-        });
-    });
+	$.get("receipt.php?facid="+id, function(data, status){
+		receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');
+		$.ajax({
+			type: "POST",
+			url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
+			data: receipt
+		});
+	});
 }
 
 function TakeposConnector(id){
 	console.log("TakeposConnector" + id);
 	$.get("ajax/ajax.php?action=printinvoiceticket&term=<?php echo $_SESSION["takeposterminal"]; ?>&id="+id, function(data, status){
-        $.ajax({
+		$.ajax({
 			type: "POST",
 			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',
 			data: 'invoice='+data
 		});
-    });
+	});
 }
 
 function DolibarrTakeposPrinting(id) {
-    console.log("DolibarrTakeposPrinting Printing invoice ticket " + id)
-    $.ajax({
-        type: "GET",
-        url: "<?php print dol_buildpath('/takepos/ajax/ajax.php', 1).'?action=printinvoiceticket&term='.$_SESSION["takeposterminal"].'&id='; ?>" + id,
-    });
+	console.log("DolibarrTakeposPrinting Printing invoice ticket " + id)
+	$.ajax({
+		type: "GET",
+		url: "<?php print dol_buildpath('/takepos/ajax/ajax.php', 1).'?action=printinvoiceticket&term='.$_SESSION["takeposterminal"].'&id='; ?>" + id,
+	});
 }
 
 function CreditNote() {
@@ -1005,14 +1022,14 @@ function CreditNote() {
 $( document ).ready(function() {
 	console.log("Set customer info and sales in header placeid=<?php echo $placeid; ?> status=<?php echo $invoice->statut; ?>");
 
-    <?php
+	<?php
 	$s = $langs->trans("Customer");
 	if ($invoice->id > 0 && ($invoice->socid != $conf->global->$constforcompanyid)) {
 		$s = $soc->name;
 	}
 	?>
 
-    $("#customerandsales").html('');
+	$("#customerandsales").html('');
 
 	$("#customerandsales").append('<a class="valignmiddle tdoverflowmax100 minwidth100" id="customer" onclick="Customer();" title="<?php print dol_escape_js($s); ?>"><span class="fas fa-building paddingrightonly"></span><?php print dol_escape_js($s); ?></a>');
 
@@ -1036,13 +1053,19 @@ $( document ).ready(function() {
 			echo '<a class="valignmiddle" title="'.dol_escape_js($langs->trans("SaleStartedAt", dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser'))).'" onclick="place=\\\'';
 			$num_sale = str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
 			echo $num_sale;
-			if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale);
+			if (str_replace("-", "", $num_sale) > $max_sale) {
+				$max_sale = str_replace("-", "", $num_sale);
+			}
 			echo '\\\'; invoiceid=\\\'';
 			echo $obj->rowid;
 			echo '\\\'; Refresh();">';
-			if ($placeid == $obj->rowid) echo "<b>";
+			if ($placeid == $obj->rowid) {
+				echo "<b>";
+			}
 			echo dol_print_date($db->jdate($obj->datec), '%H:%M', 'tzuser');
-			if ($placeid == $obj->rowid) echo "</b>";
+			if ($placeid == $obj->rowid) {
+				echo "</b>";
+			}
 			echo '</a>\');';
 		}
 		echo '$("#customerandsales").append(\'<a onclick="place=\\\'0-';
@@ -1055,8 +1078,7 @@ $( document ).ready(function() {
 	$s = '';
 
 	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
-	if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
-	{
+	if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
 		$s = '<span class="small">';
 		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 		$warehouse = new Entrepot($db);
@@ -1066,36 +1088,39 @@ $( document ).ready(function() {
 	}
 	?>
 
-    $("#infowarehouse").html('<?php print dol_escape_js($s); ?>');
+	$("#infowarehouse").html('<?php print dol_escape_js($s); ?>');
 
 	<?php
 	// Module Adherent
 	$s = '';
-	if (!empty($conf->adherent->enabled) && $invoice->socid > 0 && $invoice->socid != $conf->global->$constforcompanyid)
-	{
+	if (!empty($conf->adherent->enabled) && $invoice->socid > 0 && $invoice->socid != $conf->global->$constforcompanyid) {
 		$s = '<span class="small">';
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$langs->load("members");
 		$s .= $langs->trans("Member").': ';
 		$adh = new Adherent($db);
 		$result = $adh->fetch('', '', $invoice->socid);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$adh->ref = $adh->getFullName($langs);
-			if (empty($adh->statut)) { $s .= "<s>"; }
+			if (empty($adh->statut)) {
+				$s .= "<s>";
+			}
 			$s .= $adh->getFullName($langs);
 			$s .= ' - '.$adh->type;
-			if ($adh->datefin)
-			{
+			if ($adh->datefin) {
 				$s .= '<br>'.$langs->trans("SubscriptionEndDate").': '.dol_print_date($adh->datefin, 'day');
 				if ($adh->hasDelay()) {
 					$s .= " ".img_warning($langs->trans("Late"));
 				}
 			} else {
 				$s .= '<br>'.$langs->trans("SubscriptionNotReceived");
-				if ($adh->statut > 0) $s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
+				if ($adh->statut > 0) {
+					$s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
+				}
+			}
+			if (empty($adh->statut)) {
+				$s .= "</s>";
 			}
-	  		if (empty($adh->statut)) { $s .= "</s>"; }
 		} else {
 			$s .= '<br>'.$langs->trans("ThirdpartyNotLinkedToMember");
 		}
@@ -1111,8 +1136,7 @@ $( document ).ready(function() {
 <?php
 // Add again js for footer because this content is injected into index.php page so all init
 // for tooltip and other js beautifiers must be reexecuted too.
-if (!empty($conf->use_javascript_ajax))
-{
+if (!empty($conf->use_javascript_ajax)) {
 	print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
 	print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 }
@@ -1121,8 +1145,9 @@ print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilep
 print '<div class="div-table-responsive-no-min invoice">';
 print '<table id="tablelines" class="noborder noshadow postablelines" width="100%">';
 if ($sectionwithinvoicelink && ($mobilepage == "invoice" || $mobilepage == "")) {
-    if (!empty($conf->global->TAKEPOS_SHOW_HT)) { print '<tr><td colspan="5">'.$sectionwithinvoicelink.'</td></tr>'; }
-	else {
+	if (!empty($conf->global->TAKEPOS_SHOW_HT)) {
+		print '<tr><td colspan="5">'.$sectionwithinvoicelink.'</td></tr>';
+	} else {
 		print '<tr><td colspan="4">'.$sectionwithinvoicelink.'</td></tr>';
 	}
 }
@@ -1132,13 +1157,11 @@ print '<td class="linecoldescription">';
 if ($mobilepage == "invoice" || $mobilepage == "") {
 	print '<input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">';
 }
-if ($conf->global->TAKEPOS_BAR_RESTAURANT)
-{
+if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);
 	$resql = $db->query($sql);
 	$obj = $db->fetch_object($resql);
-	if ($obj)
-	{
+	if ($obj) {
 		$label = $obj->label;
 		$floor = $obj->floor;
 	}
@@ -1146,35 +1169,37 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 	if ($mobilepage == "invoice" || $mobilepage == "") {
 		print '<span class="opacitymedium">'.$langs->trans('Place')."</span> <b>".$label."</b><br>";
 		print '<span class="opacitymedium">'.$langs->trans('Floor')."</span> <b>".$floor."</b>";
+	} elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		print $mysoc->name;
+	} elseif ($mobilepage == "cats") {
+		print $langs->trans('Category');
+	} elseif ($mobilepage == "products") {
+		print $langs->trans('Label');
 	}
-	elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) print $mysoc->name;
-	elseif ($mobilepage == "cats") print $langs->trans('Category');
-	elseif ($mobilepage == "products") print $langs->trans('Label');
 } else {
 	print $langs->trans("Products");
 }
 print '</td>';
-if ($_SESSION["basiclayout"] != 1)
-{
+if ($_SESSION["basiclayout"] != 1) {
 	print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 	if ($conf->global->TAKEPOS_SHOW_HT) {
-        print '<td class="linecolht right nowraponall">';
-        print '<span class="opacitymedium small">' . $langs->trans('TotalHTShort') . '</span><br>';
-        // In phone version only show when it is invoice page
-        if ($mobilepage == "invoice" || $mobilepage == "") {
-            print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</span>';
-            if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
-                //Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
-                include_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
-                $multicurrency = new MultiCurrency($db);
-                $multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
-                print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">(' . price($invoice->total_ht * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
-            }
-            print '</td>';
-        }
-        print '</td>';
-    }
+		print '<td class="linecolht right nowraponall">';
+		print '<span class="opacitymedium small">' . $langs->trans('TotalHTShort') . '</span><br>';
+		// In phone version only show when it is invoice page
+		if ($mobilepage == "invoice" || $mobilepage == "") {
+			print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</span>';
+			if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+				//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+				include_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
+				$multicurrency = new MultiCurrency($db);
+				$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+				print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">(' . price($invoice->total_ht * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
+			}
+			print '</td>';
+		}
+		print '</td>';
+	}
 	print '<td class="linecolht right nowraponall">';
 	print '<span class="opacitymedium small">'.$langs->trans('TotalTTCShort').'</span><br>';
 	// In phone version only show when it is invoice page
@@ -1190,36 +1215,43 @@ if ($_SESSION["basiclayout"] != 1)
 		print '</td>';
 	}
 	print '</td>';
+} elseif ($mobilepage == "invoice") {
+	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 }
-elseif ($mobilepage == "invoice") print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 print "</tr>\n";
 
 
-if ($_SESSION["basiclayout"] == 1)
-{
-	if ($mobilepage == "cats")
-	{
+if ($_SESSION["basiclayout"] == 1) {
+	if ($mobilepage == "cats") {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorie = new Categorie($db);
 		$categories = $categorie->get_full_arbo('product');
 		$htmlforlines = '';
 		foreach ($categories as $row) {
-			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '<div class="leftcat';
-			else $htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
+			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+				$htmlforlines .= '<div class="leftcat';
+			} else {
+				$htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
+			}
 			$htmlforlines .= '" onclick="LoadProducts('.$row['id'].');">';
-			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=cat&query=cat&id='.$row['id'].'"><br>';
-			else $htmlforlines .= '<td class="left">';
+			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+				$htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=cat&query=cat&id='.$row['id'].'"><br>';
+			} else {
+				$htmlforlines .= '<td class="left">';
+			}
 			$htmlforlines .= $row['label'];
-			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '</div>'."\n";
-			else $htmlforlines .= '</td></tr>'."\n";
+			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+				$htmlforlines .= '</div>'."\n";
+			} else {
+				$htmlforlines .= '</td></tr>'."\n";
+			}
 		}
 		$htmlforlines .= '</table>';
 		$htmlforlines .= '</table>';
 		print $htmlforlines;
 	}
 
-	if ($mobilepage == "products")
-	{
+	if ($mobilepage == "products") {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$object = new Categorie($db);
 		$catid = GETPOST('catid', 'int');
@@ -1227,15 +1259,17 @@ if ($_SESSION["basiclayout"] == 1)
 		$prods = $object->getObjectsInCateg("product");
 		$htmlforlines = '';
 		foreach ($prods as $row) {
-			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '<div class="leftcat';
-			else $htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
+			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+				$htmlforlines .= '<div class="leftcat';
+			} else {
+				$htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
+			}
 			$htmlforlines .= '" onclick="AddProduct(\''.$place.'\', '.$row->id.')">';
 			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 				$htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$row->id.'"><br>';
 				$htmlforlines .= $row->label.''.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency);
 				$htmlforlines .= '</div>'."\n";
-			}
-			else {
+			} else {
 				$htmlforlines .= '<td class="left">';
 				$htmlforlines .= $row->label;
 				$htmlforlines .= '<div class="right">'.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).'</div>';
@@ -1246,8 +1280,7 @@ if ($_SESSION["basiclayout"] == 1)
 		print $htmlforlines;
 	}
 
-	if ($mobilepage == "places")
-	{
+	if ($mobilepage == "places") {
 		$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables";
 		$resql = $db->query($sql);
 		$rows = array();
@@ -1266,39 +1299,40 @@ if ($_SESSION["basiclayout"] == 1)
 	}
 }
 
-if ($placeid > 0)
-{
+if ($placeid > 0) {
 	//In Phone basic layout hide some content depends situation
-	if ($_SESSION["basiclayout"] == 1 && $mobilepage != "invoice" && $action != "order") return;
+	if ($_SESSION["basiclayout"] == 1 && $mobilepage != "invoice" && $action != "order") {
+		return;
+	}
 
-	if (is_array($invoice->lines) && count($invoice->lines))
-	{
+	if (is_array($invoice->lines) && count($invoice->lines)) {
 		print '<!-- invoice.php show lines of invoices -->'."\n";
 		$tmplines = array_reverse($invoice->lines);
-		foreach ($tmplines as $line)
-		{
-			if ($line->fk_parent_line != false)
-			{
+		foreach ($tmplines as $line) {
+			if ($line->fk_parent_line != false) {
 				$htmlsupplements[$line->fk_parent_line] .= '<tr class="drag drop oddeven posinvoiceline';
-				if ($line->special_code == "4") $htmlsupplements[$line->fk_parent_line] .= ' order';
+				if ($line->special_code == "4") {
+					$htmlsupplements[$line->fk_parent_line] .= ' order';
+				}
 				$htmlsupplements[$line->fk_parent_line] .= '" id="'.$line->id.'">';
 				$htmlsupplements[$line->fk_parent_line] .= '<td class="left">';
 				$htmlsupplements[$line->fk_parent_line] .= img_picto('', 'rightarrow');
-				if ($line->product_label) $htmlsupplements[$line->fk_parent_line] .= $line->product_label;
-				if ($line->product_label && $line->desc) $htmlsupplements[$line->fk_parent_line] .= '<br>';
-				if ($line->product_label != $line->desc)
-				{
+				if ($line->product_label) {
+					$htmlsupplements[$line->fk_parent_line] .= $line->product_label;
+				}
+				if ($line->product_label && $line->desc) {
+					$htmlsupplements[$line->fk_parent_line] .= '<br>';
+				}
+				if ($line->product_label != $line->desc) {
 					$firstline = dolGetFirstLineOfText($line->desc);
-					if ($firstline != $line->desc)
-					{
+					if ($firstline != $line->desc) {
 						$htmlsupplements[$line->fk_parent_line] .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
 					} else {
 						$htmlsupplements[$line->fk_parent_line] .= $line->desc;
 					}
 				}
 				$htmlsupplements[$line->fk_parent_line] .= '</td>';
-				if ($_SESSION["basiclayout"] != 1)
-				{
+				if ($_SESSION["basiclayout"] != 1) {
 					$htmlsupplements[$line->fk_parent_line] .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 					$htmlsupplements[$line->fk_parent_line] .= '<td class="right">'.$line->qty.'</td>';
 					$htmlsupplements[$line->fk_parent_line] .= '<td class="right">'.price($line->total_ttc).'</td>';
@@ -1314,11 +1348,15 @@ if ($placeid > 0)
 			}
 			$htmlforlines .= '" id="'.$line->id.'">';
 			$htmlforlines .= '<td class="left">';
-			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '<span class="phoneqty">'.$line->qty."</span> x ";
-			if (isset($line->product_type))
-			{
-				if (empty($line->product_type)) $htmlforlines .= img_object('', 'product').' ';
-				else $htmlforlines .= img_object('', 'service').' ';
+			if ($_SESSION["basiclayout"] == 1) {
+				$htmlforlines .= '<span class="phoneqty">'.$line->qty."</span> x ";
+			}
+			if (isset($line->product_type)) {
+				if (empty($line->product_type)) {
+					$htmlforlines .= img_object('', 'product').' ';
+				} else {
+					$htmlforlines .= img_object('', 'service').' ';
+				}
 			}
 			if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) {
 				$tooltiptext = '';
@@ -1326,45 +1364,53 @@ if ($placeid > 0)
 					$tooltiptext .= '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';
 					$tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>';
 					if ($line->product_label != $line->desc) {
-						if ($line->desc) $tooltiptext .= '<br>';
+						if ($line->desc) {
+							$tooltiptext .= '<br>';
+						}
 						$tooltiptext .= $line->desc;
 					}
 				}
 				$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
 			} else {
-				if ($line->product_label) $htmlforlines .= $line->product_label;
-				if ($line->product_label != $line->desc)
-				{
-					if ($line->product_label && $line->desc) $htmlforlines .= '<br>';
+				if ($line->product_label) {
+					$htmlforlines .= $line->product_label;
+				}
+				if ($line->product_label != $line->desc) {
+					if ($line->product_label && $line->desc) {
+						$htmlforlines .= '<br>';
+					}
 					$firstline = dolGetFirstLineOfText($line->desc, $conf->global->TAKEPOS_SHOW_N_FIRST_LINES);
-					if ($firstline != $line->desc)
-					{
+					if ($firstline != $line->desc) {
 						$htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
 					} else {
 						$htmlforlines .= $line->desc;
 					}
 				}
 			}
-			if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";
+			if (!empty($line->array_options['options_order_notes'])) {
+				$htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";
+			}
 			if ($_SESSION["basiclayout"] == 1) {
 				$htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty - 1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty + 1).');" class="publicphonebutton2 phonegreen">+</button>';
 			}
-			if ($_SESSION["basiclayout"] != 1)
-			{
+			if ($_SESSION["basiclayout"] != 1) {
 				$moreinfo = '';
 				$moreinfo .= $langs->transcountry("TotalHT", $mysoc->country_code).': '.price($line->total_ht);
-				if ($line->vat_src_code) $moreinfo .= '<br>'.$langs->trans("VATCode").': '.$line->vat_src_code;
+				if ($line->vat_src_code) {
+					$moreinfo .= '<br>'.$langs->trans("VATCode").': '.$line->vat_src_code;
+				}
 				$moreinfo .= '<br>'.$langs->transcountry("TotalVAT", $mysoc->country_code).': '.price($line->total_tva);
 				$moreinfo .= '<br>'.$langs->transcountry("TotalLT1", $mysoc->country_code).': '.price($line->total_localtax1);
 				$moreinfo .= '<br>'.$langs->transcountry("TotalLT2", $mysoc->country_code).': '.price($line->total_localtax2);
 				$moreinfo .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).': '.price($line->total_ttc);
 				//$moreinfo .= $langs->trans("TotalHT").': '.$line->total_ht;
-				if ($line->date_start || $line->date_end) $htmlforlines .= '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end).'</div>';
+				if ($line->date_start || $line->date_end) {
+					$htmlforlines .= '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end).'</div>';
+				}
 				$htmlforlines .= '</td>';
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 				$htmlforlines .= '<td class="right">';
-				if (!empty($conf->stock->enabled) && !empty($user->rights->stock->mouvement->lire))
-				{
+				if (!empty($conf->stock->enabled) && !empty($user->rights->stock->mouvement->lire)) {
 					$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 					if (!empty($conf->global->$constantforkey) && $line->fk_product > 0) {
 						$sql = "SELECT e.rowid, e.ref, e.lieu, e.fk_parent, e.statut, ps.reel, ps.rowid as product_stock_id, p.pmp";
@@ -1380,9 +1426,13 @@ if ($placeid > 0)
 							$obj = $db->fetch_object($resql);
 							$stock_real = price2num($obj->reel, 'MS');
 							$htmlforlines .= $line->qty;
-							if ($line->qty && $line->qty > $stock_real) $htmlforlines .= '<span style="color: var(--amountremaintopaycolor)">';
+							if ($line->qty && $line->qty > $stock_real) {
+								$htmlforlines .= '<span style="color: var(--amountremaintopaycolor)">';
+							}
 							$htmlforlines .= ' <span class="posstocktoolow">('.$langs->trans("Stock").' '.$stock_real.')</span>';
-							if ($line->qty && $line->qty > $stock_real) $htmlforlines .= "</span>";
+							if ($line->qty && $line->qty > $stock_real) {
+								$htmlforlines .= "</span>";
+							}
 						} else {
 							dol_print_error($db);
 						}
@@ -1394,18 +1444,18 @@ if ($placeid > 0)
 				}
 
 				$htmlforlines .= '</td>';
-                if ($conf->global->TAKEPOS_SHOW_HT) {
-                    $htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
-                    $htmlforlines .= price($line->total_ht, 1, '', 1, -1, -1, $conf->currency);
-                    if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
-                        //Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
-                        include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
-                        $multicurrency = new MultiCurrency($db);
-                        $multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
-                        $htmlforlines .= '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($line->total_ht * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
-                    }
-                    $htmlforlines .= '</td>';
-                }
+				if ($conf->global->TAKEPOS_SHOW_HT) {
+					$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
+					$htmlforlines .= price($line->total_ht, 1, '', 1, -1, -1, $conf->currency);
+					if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+						//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+						include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+						$multicurrency = new MultiCurrency($db);
+						$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+						$htmlforlines .= '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($line->total_ht * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
+					}
+					$htmlforlines .= '</td>';
+				}
 				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
 				$htmlforlines .= price($line->total_ttc, 1, '', 1, -1, -1, $conf->currency);
 				if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
@@ -1424,14 +1474,18 @@ if ($placeid > 0)
 		}
 	} else {
 		print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td>';
-		if (!empty($conf->global->TAKEPOS_SHOW_HT)){ print '<td></td>'; }
+		if (!empty($conf->global->TAKEPOS_SHOW_HT)) {
+			print '<td></td>';
+		}
 		print '</tr>';
 	}
 } else {      // No invoice generated yet
 	print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td>';
 
-    if (!empty($conf->global->TAKEPOS_SHOW_HT)){ print '<td></td>'; }
-    print '</tr>';
+	if (!empty($conf->global->TAKEPOS_SHOW_HT)) {
+		print '<td></td>';
+	}
+	print '</tr>';
 }
 
 print '</table>';
@@ -1441,8 +1495,7 @@ if (($action == "valid" || $action == "history") && $invoice->type != Facture::T
 }
 
 
-if ($action == "search")
-{
+if ($action == "search") {
 	print '<center>
 	<input type="text" id="search" name="search" onkeyup="Search2();" name="search" style="width:80%;font-size: 150%;" placeholder=' . $langs->trans('Search').'
 	</center>';
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index c1683073371..d4b6c023186 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -25,11 +25,21 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -50,19 +60,16 @@ if (empty($user->rights->takepos->run)) {
  */
 
 $invoice = new Facture($db);
-if ($invoiceid > 0)
-{
+if ($invoiceid > 0) {
 	$invoice->fetch($invoiceid);
 } else {
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
 	$resql = $db->query($sql);
 	$obj = $db->fetch_object($resql);
-	if ($obj)
-	{
+	if ($obj) {
 		$invoiceid = $obj->rowid;
 	}
-	if (!$invoiceid)
-	{
+	if (!$invoiceid) {
 		$invoiceid = 0; // Invoice does not exist yet
 	} else {
 		$invoice->fetch($invoiceid);
@@ -92,9 +99,15 @@ $resql = $db->query($sql);
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
 		$paycode = $obj->code;
-		if ($paycode == 'LIQ') $paycode = 'CASH';
-		if ($paycode == 'CB')  $paycode = 'CB';
-		if ($paycode == 'CHQ') $paycode = 'CHEQUE';
+		if ($paycode == 'LIQ') {
+			$paycode = 'CASH';
+		}
+		if ($paycode == 'CB') {
+			$paycode = 'CB';
+		}
+		if ($paycode == 'CHQ') {
+			$paycode = 'CHEQUE';
+		}
 
 		$accountname = "CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
 		if (!empty($conf->global->$accountname) && $conf->global->$accountname > 0) {
@@ -106,7 +119,9 @@ if ($resql) {
 ?>
 <link rel="stylesheet" href="css/pos.css.php">
 <?php
-if ($conf->global->TAKEPOS_COLOR_THEME == 1) print '<link rel="stylesheet" href="css/colorful.css">';
+if ($conf->global->TAKEPOS_COLOR_THEME == 1) {
+	print '<link rel="stylesheet" href="css/colorful.css">';
+}
 ?>
 </head>
 <body>
@@ -114,58 +129,63 @@ if ($conf->global->TAKEPOS_COLOR_THEME == 1) print '<link rel="stylesheet" href=
 <script>
 <?php
 $remaintopay = 0;
-if ($invoice->id > 0)
-{
+if ($invoice->id > 0) {
 	$remaintopay = $invoice->getRemainToPay();
 }
 $alreadypayed = (is_object($invoice) ? ($invoice->total_ttc - $remaintopay) : 0);
 
-if ($conf->global->TAKEPOS_NUMPAD == 0) print "var received='';";
-else print "var received=0;";
+if ($conf->global->TAKEPOS_NUMPAD == 0) {
+	print "var received='';";
+} else {
+	print "var received=0;";
+}
 
 ?>
 	var alreadypayed = <?php echo $alreadypayed ?>;
 
 	function addreceived(price)
 	{
-    	<?php
-		if (empty($conf->global->TAKEPOS_NUMPAD)) print 'received+=String(price);'."\n";
-		else print 'received+=parseFloat(price);'."\n";
+		<?php
+		if (empty($conf->global->TAKEPOS_NUMPAD)) {
+			print 'received+=String(price);'."\n";
+		} else {
+			print 'received+=parseFloat(price);'."\n";
+		}
 		?>
-    	$('.change1').html(pricejs(parseFloat(received), 'MT'));
-    	$('.change1').val(parseFloat(received));
+		$('.change1').html(pricejs(parseFloat(received), 'MT'));
+		$('.change1').val(parseFloat(received));
 		alreadypaydplusreceived=price2numjs(alreadypayed + parseFloat(received));
-    	//console.log("already+received = "+alreadypaydplusreceived);
-    	//console.log("total_ttc = "+<?php echo $invoice->total_ttc; ?>);
-    	if (alreadypaydplusreceived > <?php echo $invoice->total_ttc; ?>)
-   		{
+		//console.log("already+received = "+alreadypaydplusreceived);
+		//console.log("total_ttc = "+<?php echo $invoice->total_ttc; ?>);
+		if (alreadypaydplusreceived > <?php echo $invoice->total_ttc; ?>)
+		   {
 			var change=parseFloat(alreadypayed + parseFloat(received) - <?php echo $invoice->total_ttc; ?>);
 			$('.change2').html(pricejs(change, 'MT'));
-	    	$('.change2').val(change);
-	    	$('.change1').removeClass('colorred');
-	    	$('.change1').addClass('colorgreen');
-	    	$('.change2').removeClass('colorwhite');
-	    	$('.change2').addClass('colorred');
+			$('.change2').val(change);
+			$('.change1').removeClass('colorred');
+			$('.change1').addClass('colorgreen');
+			$('.change2').removeClass('colorwhite');
+			$('.change2').addClass('colorred');
 		}
-    	else
-    	{
+		else
+		{
 			$('.change2').html(pricejs(0, 'MT'));
-	    	$('.change2').val(0);
-	    	if (alreadypaydplusreceived == <?php echo $invoice->total_ttc; ?>)
-	    	{
-		    	$('.change1').removeClass('colorred');
-		    	$('.change1').addClass('colorgreen');
-	    		$('.change2').removeClass('colorred');
-	    		$('.change2').addClass('colorwhite');
-	    	}
-	    	else
-	    	{
-		    	$('.change1').removeClass('colorgreen');
-		    	$('.change1').addClass('colorred');
-	    		$('.change2').removeClass('colorred');
-	    		$('.change2').addClass('colorwhite');
-	    	}
-    	}
+			$('.change2').val(0);
+			if (alreadypaydplusreceived == <?php echo $invoice->total_ttc; ?>)
+			{
+				$('.change1').removeClass('colorred');
+				$('.change1').addClass('colorgreen');
+				$('.change2').removeClass('colorred');
+				$('.change2').addClass('colorwhite');
+			}
+			else
+			{
+				$('.change1').removeClass('colorgreen');
+				$('.change1').addClass('colorred');
+				$('.change2').removeClass('colorred');
+				$('.change2').addClass('colorwhite');
+			}
+		}
 	}
 
 	function reset()
@@ -175,10 +195,10 @@ else print "var received=0;";
 		$('.change1').val(price2numjs(received));
 		$('.change2').html(pricejs(received, 'MT'));
 		$('.change2').val(price2numjs(received));
-    	$('.change1').removeClass('colorgreen');
-    	$('.change1').addClass('colorred');
-    	$('.change2').removeClass('colorred');
-    	$('.change2').addClass('colorwhite');
+		$('.change1').removeClass('colorgreen');
+		$('.change1').addClass('colorred');
+		$('.change2').removeClass('colorred');
+		$('.change2').addClass('colorwhite');
 	}
 
 	function Validate(payment)
@@ -192,10 +212,10 @@ else print "var received=0;";
 		}
 		console.log("We click on the payment mode to pay amount = "+amountpayed);
 		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay="+payment+"&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
-		    if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
-		    	console.log("Close popup");
-		    	parent.$.colorbox.close();
-		    }
+			if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
+				console.log("Close popup");
+				parent.$.colorbox.close();
+			}
 			else {
 				console.log("Amount is not comple, so we do NOT close popup and reload it.");
 				location.reload();
@@ -206,32 +226,32 @@ else print "var received=0;";
 	function ValidateSumup() {
 		console.log("Launch ValidateSumup");
 		<?php $_SESSION['SMP_CURRENT_PAYMENT'] = "NEW" ?>
-        var invoiceid = <?php echo($invoiceid > 0 ? $invoiceid : 0); ?>;
-        var amountpayed = $("#change1").val();
-        if (amountpayed > <?php echo $invoice->total_ttc; ?>) {
-            amountpayed = <?php echo $invoice->total_ttc; ?>;
-        }
+		var invoiceid = <?php echo($invoiceid > 0 ? $invoiceid : 0); ?>;
+		var amountpayed = $("#change1").val();
+		if (amountpayed > <?php echo $invoice->total_ttc; ?>) {
+			amountpayed = <?php echo $invoice->total_ttc; ?>;
+		}
 
-        // Starting sumup app
-        window.open('sumupmerchant://pay/1.0?affiliate-key=<?php echo $conf->global->TAKEPOS_SUMUP_AFFILIATE ?>&app-id=<?php echo $conf->global->TAKEPOS_SUMUP_APPID ?>&total=' + amountpayed + '&currency=EUR&title=' + invoiceid + '&callback=<?php echo DOL_MAIN_URL_ROOT ?>/takepos/smpcb.php');
+		// Starting sumup app
+		window.open('sumupmerchant://pay/1.0?affiliate-key=<?php echo $conf->global->TAKEPOS_SUMUP_AFFILIATE ?>&app-id=<?php echo $conf->global->TAKEPOS_SUMUP_APPID ?>&total=' + amountpayed + '&currency=EUR&title=' + invoiceid + '&callback=<?php echo DOL_MAIN_URL_ROOT ?>/takepos/smpcb.php');
 
-        var loop = window.setInterval(function () {
-            $.ajax('<?php echo DOL_URL_ROOT ?>/takepos/smpcb.php?status').done(function (data) {
-                console.log(data);
-                if (data === "SUCCESS") {
-                    parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay=CB&amount=" + amountpayed + "&invoiceid=" + invoiceid, function () {
-                        //parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
-                        parent.$.colorbox.close();
-                        //parent.setFocusOnSearchField();	// This does not have effect
-                    });
-                    clearInterval(loop);
-                } else if (data === "FAILED") {
-                    parent.$.colorbox.close();
-                    clearInterval(loop);
-                }
-            });
-        }, 2500);
-    }
+		var loop = window.setInterval(function () {
+			$.ajax('<?php echo DOL_URL_ROOT ?>/takepos/smpcb.php?status').done(function (data) {
+				console.log(data);
+				if (data === "SUCCESS") {
+					parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay=CB&amount=" + amountpayed + "&invoiceid=" + invoiceid, function () {
+						//parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
+						parent.$.colorbox.close();
+						//parent.setFocusOnSearchField();	// This does not have effect
+					});
+					clearInterval(loop);
+				} else if (data === "FAILED") {
+					parent.$.colorbox.close();
+					clearInterval(loop);
+				}
+			});
+		}, 2500);
+	}
 </script>
 
 <div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">
@@ -245,7 +265,7 @@ else print "var received=0;";
 </div>
 <?php } ?>
 <div class="paymentbordline paymentbordlinereceived">
-    <center><span class="takepospay"><font color="white"><?php echo $langs->trans("Received"); ?>: </font><span class="change1 colorred"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change1" class="change1" value="0"></span></center>
+	<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Received"); ?>: </font><span class="change1 colorred"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change1" class="change1" value="0"></span></center>
 </div>
 <div class="paymentbordline paymentbordlinechange">
 	<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Change"); ?>: </font><span class="change2 colorwhite"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change2" class="change2" value="0"></span></center>
@@ -294,13 +314,19 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+			$payIcon = 'coins';
+		}
 	} elseif ($paycode == 'CB') {
 		$paycode = 'card';
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+			$payIcon = 'credit-card';
+		}
 	} elseif ($paycode == 'CHQ') {
 		$paycode = 'cheque';
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+			$payIcon = 'money-check';
+		}
 	}
 
 	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><span class="hideonsmartphone"><br>'. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</span></button>';
@@ -317,13 +343,19 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+			$payIcon = 'coins';
+		}
 	} elseif ($paycode == 'CB') {
 		$paycode = 'card';
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+			$payIcon = 'credit-card';
+		}
 	} elseif ($paycode == 'CHQ') {
 		$paycode = 'cheque';
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+			$payIcon = 'money-check';
+		}
 	}
 
 	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span><br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code) : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
@@ -341,13 +373,19 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'coins';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+			$payIcon = 'coins';
+		}
 	} elseif ($paycode == 'CB') {
 		$paycode = 'card';
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'credit-card';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+			$payIcon = 'credit-card';
+		}
 	} elseif ($paycode == 'CHQ') {
 		$paycode = 'cheque';
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+			$payIcon = 'money-check';
+		}
 	}
 
 	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.' iconwithlabel"></span>'.(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS) ? '<br> '. $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code) : '') : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 9084fc448f1..7eaa4d9ec68 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -25,13 +25,25 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
-if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) require '../main.inc.php';
+if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	require '../main.inc.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/facture.class.php';
@@ -47,8 +59,7 @@ $action = GETPOST('action', 'aZ09');
 $setterminal = GETPOST('setterminal', 'int');
 $idproduct = GETPOST('idproduct', 'int');
 
-if ($setterminal > 0)
-{
+if ($setterminal > 0) {
 	$_SESSION["takeposterminal"] = $setterminal;
 }
 
@@ -83,8 +94,7 @@ if ($action == "productinfo") {
 	print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
 	print '<button type="button" class="publicphonebutton2 phoneblue total" onclick="CheckPlease();">'.$langs->trans('Payment').'</button>';
 	print '<br>';
-}
-elseif ($action == "checkplease") {
+} elseif ($action == "checkplease") {
 	if (GETPOSTISSET("payment")) {
 		print '<h1>'.$langs->trans('StatusOrderDelivered').'</h1>';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
@@ -114,10 +124,8 @@ elseif ($action == "checkplease") {
 	$selectedline = GETPOST('selectedline', 'int');
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
-	foreach ($invoice->lines as $line)
-	{
-		if ($line->id == $selectedline)
-		{
+	foreach ($invoice->lines as $line) {
+		if ($line->id == $selectedline) {
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
 			print "<b>".$prod->label."</b><br>";
@@ -133,7 +141,9 @@ elseif ($action == "checkplease") {
 } else {
 	// Title
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+		$title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	}
 	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="mobile-web-app-capable" content="yes">
@@ -149,12 +159,9 @@ elseif ($action == "checkplease") {
 	// Search root category to know its level
 	//$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
 	$levelofrootcategory = 0;
-	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
-	{
-		foreach ($categories as $key => $categorycursor)
-		{
-			if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-			{
+	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {
+		foreach ($categories as $key => $categorycursor) {
+			if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID) {
 				$levelofrootcategory = $categorycursor['level'];
 				break;
 			}
@@ -164,10 +171,8 @@ elseif ($action == "checkplease") {
 
 	$maincategories = array();
 	$subcategories = array();
-	foreach ($categories as $key => $categorycursor)
-	{
-		if ($categorycursor['level'] == $levelofmaincategories)
-		{
+	foreach ($categories as $key => $categorycursor) {
+		if ($categorycursor['level'] == $levelofmaincategories) {
 			$maincategories[$key] = $categorycursor;
 		} else {
 			$subcategories[$key] = $categorycursor;
@@ -193,23 +198,22 @@ var editnumber="";
 
 
 $( document ).ready(function() {
-    console.log("Refresh");
+	console.log("Refresh");
 	LoadPlace(place);
 });
 
 function LoadPlace(placeid){
-    place=placeid;
+	place=placeid;
 	<?php
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
 		});';
 	}
 	?>
-    LoadCats();
+	LoadCats();
 }
 
 function AddProduct(placeid, productid){
@@ -219,8 +223,7 @@ function AddProduct(placeid, productid){
 		print 'place=placeid;
 		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
 		});';
-	}
-	else {
+	} else {
 		print 'AddProductConfirm(placeid, productid);';
 	}
 	?>
@@ -237,8 +240,7 @@ function AddProductConfirm(placeid, productid){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
@@ -258,8 +260,7 @@ function SetQty(place, selectedline, qty){
 		});
 	}
 		<?php
-	}
-	else {
+	} else {
 		?>
 	if (qty==0){
 		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {
@@ -278,7 +279,7 @@ function SetQty(place, selectedline, qty){
 function SetNote(place, selectedline){
 	var note = prompt("<?php $langs->trans('Note'); ?>", "");
 	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
-    });
+	});
 	LoadCats();
 }
 
@@ -287,8 +288,7 @@ function LoadCats(){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
 		});';
 	}
@@ -301,8 +301,7 @@ function LoadProducts(idcat){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
 	}
@@ -310,20 +309,19 @@ function LoadProducts(idcat){
 }
 
 function LoadPlacesList(){
-    $("#phonediv1").load("invoice.php?mobilepage=places", function() {
-    });
+	$("#phonediv1").load("invoice.php?mobilepage=places", function() {
+	});
 }
 
 function TakeposPrintingOrder(){
-    console.log("TakeposPrintingOrder");
+	console.log("TakeposPrintingOrder");
 	<?php
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?action=order&mobilepage=order&place="+place, function() {
 		});';
 		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&place="+place, function() {
 		});';
-	}
-	else {
+	} else {
 		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
 		});';
 	}
@@ -331,7 +329,7 @@ function TakeposPrintingOrder(){
 }
 
 function Exit(){
-    window.location.href='../user/logout.php';
+	window.location.href='../user/logout.php';
 }
 
 function CheckPlease(payment){
@@ -350,7 +348,9 @@ function CheckPlease(payment){
 
 <body style="background-color:#D1D1D1;">
 	<?php
-	if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
+	if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") {
+		print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
+	}
 	?>
 <div class="container">
 	<div class="phonebuttonsrow">
@@ -360,8 +360,7 @@ function CheckPlease(payment){
 			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
-		}
-		else {
+		} else {
 			print '<button type="button" class="publicphonebutton phoneblue" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
 			print '<button type="button" class="publicphonebutton phoneorange" onclick="PublicPreOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
 			print '<button type="button" class="publicphonebutton phonegreen" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
diff --git a/htdocs/takepos/public/auto_order.php b/htdocs/takepos/public/auto_order.php
index e7853f7141b..308cd75b12e 100644
--- a/htdocs/takepos/public/auto_order.php
+++ b/htdocs/takepos/public/auto_order.php
@@ -21,18 +21,30 @@
  *       \brief      Public orders for customers
  */
 
-if (!defined("NOLOGIN"))       define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
-if (!defined('NOIPCHECK'))	   define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
 
 require '../../main.inc.php';
 
-if (!$conf->global->TAKEPOS_AUTO_ORDER) accessforbidden(); // If Auto Order is disabled never allow NO LOGIN access
+if (!$conf->global->TAKEPOS_AUTO_ORDER) {
+	accessforbidden(); // If Auto Order is disabled never allow NO LOGIN access
+}
 
 $_SESSION["basiclayout"] = 1;
 $_SESSION["takeposterminal"] = 1;
 
 define('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE', 1);
-if (GETPOSTISSET("mobilepage")) require '../invoice.php';
-elseif (GETPOSTISSET("genimg")) require DOL_DOCUMENT_ROOT.'/takepos/genimg/index.php';
-else require '../phone.php';
+if (GETPOSTISSET("mobilepage")) {
+	require '../invoice.php';
+} elseif (GETPOSTISSET("genimg")) {
+	require DOL_DOCUMENT_ROOT.'/takepos/genimg/index.php';
+} else {
+	require '../phone.php';
+}
diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
index 5814888f2cf..ad4dfd9035e 100644
--- a/htdocs/takepos/public/menu.php
+++ b/htdocs/takepos/public/menu.php
@@ -21,15 +21,23 @@
  *       \brief      Public menu for customers
  */
 
-if (!defined("NOLOGIN"))       define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
-if (!defined('NOIPCHECK'))	   define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
 
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-if (!$conf->global->TAKEPOS_QR_MENU) accessforbidden(); // If Restaurant Menu is disabled never allow NO LOGIN access
+if (!$conf->global->TAKEPOS_QR_MENU) {
+	accessforbidden(); // If Restaurant Menu is disabled never allow NO LOGIN access
+}
 ?>
 <!DOCTYPE html>
 <html>
@@ -43,21 +51,18 @@ if (!$conf->global->TAKEPOS_QR_MENU) accessforbidden(); // If Restaurant Menu is
 <body>
 <!-- partial:index.partial.html -->
 <body>
-    <div class="grid-container">
-      <div class="grid-x grid-padding-x menu2">
-        <div class="cell small-12">
-          <h1><?php print $mysoc->name; ?> - <small><?php print $langs->trans('RestaurantMenu'); ?></small></h1>
+	<div class="grid-container">
+	  <div class="grid-x grid-padding-x menu2">
+		<div class="cell small-12">
+		  <h1><?php print $mysoc->name; ?> - <small><?php print $langs->trans('RestaurantMenu'); ?></small></h1>
 
 <?php
 $categorie = new Categorie($db);
 $categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
 $levelofrootcategory = 0;
-if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0)
-{
-	foreach ($categories as $key => $categorycursor)
-	{
-		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID)
-		{
+if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {
+	foreach ($categories as $key => $categorycursor) {
+		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID) {
 			$levelofrootcategory = $categorycursor['level'];
 			break;
 		}
@@ -67,10 +72,8 @@ $levelofmaincategories = $levelofrootcategory + 1;
 
 $maincategories = array();
 $subcategories = array();
-foreach ($categories as $key => $categorycursor)
-{
-	if ($categorycursor['level'] == $levelofmaincategories)
-	{
+foreach ($categories as $key => $categorycursor) {
+	if ($categorycursor['level'] == $levelofmaincategories) {
 		$maincategories[$key] = $categorycursor;
 	} else {
 		$subcategories[$key] = $categorycursor;
@@ -103,12 +106,12 @@ foreach ($maincategories as $cat) {
 ?>
 			</div>
 		</div>
-    </div>
-    <footer class="footer">
-      <div class="container">
-        <p class="text-muted"><?php print $mysoc->name; ?></p>
-      </div>
-    </footer>
+	</div>
+	<footer class="footer">
+	  <div class="container">
+		<p class="text-muted"><?php print $mysoc->name; ?></p>
+	  </div>
+	</footer>
   </body>
 <!-- partial -->
   <script src='https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js'></script>
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 6d8cc869035..dd895eb4265 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -31,10 +31,18 @@ if (!isset($action)) {
 	//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
 	//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
 	//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
-	if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-	if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
-	if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
-	if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
+	if (!defined('NOTOKENRENEWAL')) {
+		define('NOTOKENRENEWAL', '1');
+	}
+	if (!defined('NOREQUIREMENU')) {
+		define('NOREQUIREMENU', '1');
+	}
+	if (!defined('NOREQUIREHTML')) {
+		define('NOREQUIREHTML', '1');
+	}
+	if (!defined('NOREQUIREAJAX')) {
+		define('NOREQUIREAJAX', '1');
+	}
 
 	require '../main.inc.php'; // If this file is called from send.php avoid load again
 }
@@ -59,13 +67,11 @@ if (empty($user->rights->takepos->run)) {
 
 top_httphead('text/html');
 
-if ($place > 0)
-{
+if ($place > 0) {
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
 	$resql = $db->query($sql);
 	$obj = $db->fetch_object($resql);
-	if ($obj)
-	{
+	if ($obj) {
 		$facid = $obj->rowid;
 	}
 }
@@ -86,13 +92,13 @@ if (!empty($hookmanager->resPrint)) {
 <body>
 <style>
 .right {
-    text-align: right;
+	text-align: right;
 }
 .center {
-    text-align: center;
+	text-align: center;
 }
 .left {
-    text-align: left;
+	text-align: left;
 }
 </style>
 <center>
@@ -104,12 +110,15 @@ if (!empty($hookmanager->resPrint)) {
 <p class="left">
 <?php
 $constFreeText = 'TAKEPOS_HEADER'.$_SESSION['takeposterminal'];
-if (!empty($conf->global->TAKEPOS_HEADER) || !empty($conf->global->{$constFreeText}))
-{
+if (!empty($conf->global->TAKEPOS_HEADER) || !empty($conf->global->{$constFreeText})) {
 	$newfreetext = '';
 	$substitutionarray = getCommonSubstitutionArray($langs);
-	if (!empty($conf->global->TAKEPOS_HEADER))      $newfreetext .= make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray);
-	if (!empty($conf->global->{$constFreeText}))    $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray);
+	if (!empty($conf->global->TAKEPOS_HEADER)) {
+		$newfreetext .= make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray);
+	}
+	if (!empty($conf->global->{$constFreeText})) {
+		$newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray);
+	}
 	print $newfreetext;
 }
 ?>
@@ -117,16 +126,22 @@ if (!empty($conf->global->TAKEPOS_HEADER) || !empty($conf->global->{$constFreeTe
 <p class="right">
 <?php
 print $langs->trans('Date')." ".dol_print_date($object->date, 'day').'<br>';
-if (!empty($conf->global->TAKEPOS_RECEIPT_NAME)) print $conf->global->TAKEPOS_RECEIPT_NAME." ";
-if ($object->statut == Facture::STATUS_DRAFT) print str_replace(")", "", str_replace("-", " ".$langs->trans('Place')." ", str_replace("(PROV-POS", $langs->trans("Terminal")." ", $object->ref)));
-else print $object->ref;
-if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
-{
-	if ($object->socid != $conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]})
-	{
+if (!empty($conf->global->TAKEPOS_RECEIPT_NAME)) {
+	print $conf->global->TAKEPOS_RECEIPT_NAME." ";
+}
+if ($object->statut == Facture::STATUS_DRAFT) {
+	print str_replace(")", "", str_replace("-", " ".$langs->trans('Place')." ", str_replace("(PROV-POS", $langs->trans("Terminal")." ", $object->ref)));
+} else {
+	print $object->ref;
+}
+if ($conf->global->TAKEPOS_SHOW_CUSTOMER) {
+	if ($object->socid != $conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}) {
 		$soc = new Societe($db);
-		if ($object->socid > 0) $soc->fetch($object->socid);
-		else $soc->fetch($conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]});
+		if ($object->socid > 0) {
+			$soc->fetch($object->socid);
+		} else {
+			$soc->fetch($conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]});
+		}
 		print "<br>".$langs->trans("Customer").': '.$soc->name;
 	}
 }
@@ -135,52 +150,69 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 <br>
 
 <table width="100%" style="border-top-style: double;">
-    <thead>
+	<thead>
 	<tr>
-        <th class="center"><?php print $langs->trans("Label"); ?></th>
-        <th class="right"><?php print $langs->trans("Qty"); ?></th>
-        <th class="right"><?php if ($gift != 1) print $langs->trans("Price"); ?></th>
-        <?php  if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
-        <th class="right"><?php if ($gift != 1) print $langs->trans("TotalHT"); ?></th>
-        <?php } ?>
-        <th class="right"><?php if ($gift != 1) print $langs->trans("TotalTTC"); ?></th>
+		<th class="center"><?php print $langs->trans("Label"); ?></th>
+		<th class="right"><?php print $langs->trans("Qty"); ?></th>
+		<th class="right"><?php if ($gift != 1) {
+			print $langs->trans("Price");
+						  } ?></th>
+		<?php  if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
+		<th class="right"><?php if ($gift != 1) {
+			print $langs->trans("TotalHT");
+						  } ?></th>
+		<?php } ?>
+		<th class="right"><?php if ($gift != 1) {
+			print $langs->trans("TotalTTC");
+						  } ?></th>
 	</tr>
-    </thead>
-    <tbody>
-    <?php
-	foreach ($object->lines as $line)
-	{
+	</thead>
+	<tbody>
+	<?php
+	foreach ($object->lines as $line) {
 		?>
-    <tr>
-        <td>
-		<?php if (!empty($line->product_label)) echo $line->product_label;
-		else echo $line->description; ?>
-        </td>
-        <td class="right"><?php echo $line->qty; ?></td>
-        <td class="right"><?php if ($gift != 1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
-        <?php
-        if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
-                    <td class="right"><?php if ($gift != 1) echo price($line->total_ht, 1); ?></td>
-            <?php
-        }
-        ?>
-        <td class="right"><?php if ($gift != 1) echo price($line->total_ttc, 1); ?></td>
-    </tr>
-        <?php
+	<tr>
+		<td>
+		<?php if (!empty($line->product_label)) {
+			echo $line->product_label;
+		} else {
+			echo $line->description;
+		} ?>
+		</td>
+		<td class="right"><?php echo $line->qty; ?></td>
+		<td class="right"><?php if ($gift != 1) {
+			echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1);
+						  } ?></td>
+		<?php
+		if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
+					<td class="right"><?php if ($gift != 1) {
+						echo price($line->total_ht, 1);
+									  } ?></td>
+			<?php
+		}
+		?>
+		<td class="right"><?php if ($gift != 1) {
+			echo price($line->total_ttc, 1);
+						  } ?></td>
+	</tr>
+		<?php
 	}
 	?>
-    </tbody>
+	</tbody>
 </table>
 <br>
 <table class="right">
 <tr>
-    <th class="right"><?php if ($gift != 1) echo $langs->trans("TotalHT"); ?></th>
-    <td class="right"><?php if ($gift != 1) echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+	<th class="right"><?php if ($gift != 1) {
+		echo $langs->trans("TotalHT");
+					  } ?></th>
+	<td class="right"><?php if ($gift != 1) {
+		echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n";
+					  } ?></td>
 </tr>
 <?php if ($conf->global->TAKEPOS_TICKET_VAT_GROUPPED) {
 	$vat_groups = array();
-	foreach ($object->lines as $line)
-	{
+	foreach ($object->lines as $line) {
 		if (!array_key_exists($line->tva_tx, $vat_groups)) {
 			$vat_groups[$line->tva_tx] = 0;
 		}
@@ -189,18 +221,26 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 	foreach ($vat_groups as $key => $val) {
 		?>
 	<tr>
-		<th align="right"><?php if ($gift != 1) echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>
-		<td align="right"><?php if ($gift != 1) echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+		<th align="right"><?php if ($gift != 1) {
+			echo $langs->trans("VAT").' '.vatrate($key, 1);
+						  } ?></th>
+		<td align="right"><?php if ($gift != 1) {
+			echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n";
+						  } ?></td>
 	</tr>
-        <?php
+		<?php
 	}
 } else { ?>
 <tr>
-	<th class="right"><?php if ($gift != 1) echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+	<th class="right"><?php if ($gift != 1) {
+		echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n";
+					  } ?></td>
 </tr>
 <?php } ?>
 <tr>
-	<th class="right"><?php if ($gift != 1) echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+	<th class="right"><?php if ($gift != 1) {
+		echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n";
+					  } ?></td>
 </tr>
 <?php
 if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
@@ -209,7 +249,9 @@ if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"
 	$multicurrency = new MultiCurrency($db);
 	$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
 	echo '<tr><th class="right">';
-	if ($gift != 1) echo ''.$langs->trans("TotalTTC").' '.$_SESSION["takeposcustomercurrency"].'</th><td class="right">'.price($object->total_ttc * $multicurrency->rate->rate, 1, '', 1, - 1, - 1, $_SESSION["takeposcustomercurrency"])."\n";
+	if ($gift != 1) {
+		echo ''.$langs->trans("TotalTTC").' '.$_SESSION["takeposcustomercurrency"].'</th><td class="right">'.price($object->total_ttc * $multicurrency->rate->rate, 1, '', 1, - 1, - 1, $_SESSION["takeposcustomercurrency"])."\n";
+	}
 	echo '</td></tr>';
 }
 
@@ -221,8 +263,7 @@ if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
 	$sql .= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$facid;
 	$sql .= " ORDER BY p.datep";
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 		while ($i < $num) {
@@ -233,12 +274,13 @@ if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
 			echo '</td>';
 			echo '<td class="right">';
 			$amount_payment = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
-			if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
+			if ($row->code == "LIQ") {
+				$amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
+			}
 			echo price($amount_payment, 1, '', 1, - 1, - 1, $conf->currency);
 			echo '</td>';
 			echo '</tr>';
-			if ($row->code == "LIQ" && $row->pos_change > 0) // Print change only in cash payments
-			{
+			if ($row->code == "LIQ" && $row->pos_change > 0) { // Print change only in cash payments
 				echo '<tr>';
 				echo '<td class="right">';
 				echo $langs->trans("Change");
@@ -260,18 +302,21 @@ if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
 <br>
 <?php
 $constFreeText = 'TAKEPOS_FOOTER'.$_SESSION['takeposterminal'];
-if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeText}))
-{
+if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeText})) {
 	$newfreetext = '';
 	$substitutionarray = getCommonSubstitutionArray($langs);
-	if (!empty($conf->global->{$constFreeText}))    $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray);
-	if (!empty($conf->global->TAKEPOS_FOOTER))      $newfreetext .= make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray);
+	if (!empty($conf->global->{$constFreeText})) {
+		$newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray);
+	}
+	if (!empty($conf->global->TAKEPOS_FOOTER)) {
+		$newfreetext .= make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray);
+	}
 	print $newfreetext;
 }
 ?>
 
 <script type="text/javascript">
-    window.print();
+	window.print();
 </script>
 </body>
 </html>
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index dd808d9a19d..38b284a8ed0 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -25,11 +25,21 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -48,19 +58,16 @@ if (empty($user->rights->takepos->run)) {
  */
 
 $invoice = new Facture($db);
-if ($invoiceid > 0)
-{
+if ($invoiceid > 0) {
 	$invoice->fetch($invoiceid);
 } else {
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
 	$resql = $db->query($sql);
 	$obj = $db->fetch_object($resql);
-	if ($obj)
-	{
+	if ($obj) {
 		$invoiceid = $obj->rowid;
 	}
-	if (!$invoiceid)
-	{
+	if (!$invoiceid) {
 		$invoiceid = 0; // Invoice does not exist yet
 	} else {
 		$invoice->fetch($invoiceid);
@@ -87,111 +94,111 @@ if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->glob
 <body>
 
 <script>
-    var reductionType ='';
+	var reductionType ='';
 	var reductionTotal = '';
-    var editAction = '';
-    var editNumber = '';
+	var editAction = '';
+	var editNumber = '';
 	var htmlBtnOK = '<span style="font-size: 14pt;">OK</span>';
 	var htmlReductionPercent = '<?php echo dol_escape_js($htmlReductionPercent); ?>';
 	var htmlReductionAmount = '<?php echo dol_escape_js($htmlReductionAmount); ?>';
 
-    /**
-     * Reset values
-     */
-    function Reset()
-    {
-        reductionType = '';
-        reductionTotal = '';
-        editAction = '';
-        editNumber = '';
-        jQuery('#reduction_total').val(reductionTotal);
+	/**
+	 * Reset values
+	 */
+	function Reset()
+	{
+		reductionType = '';
+		reductionTotal = '';
+		editAction = '';
+		editNumber = '';
+		jQuery('#reduction_total').val(reductionTotal);
 		jQuery("#reduction_type_percent").html(htmlReductionPercent);
 		jQuery('#reduction_type_amount').html(htmlReductionAmount);
-    }
+	}
 
-    /**
-     * Edit action
-     *
-     * @param   {string}  number    Number pressed
-     */
-    function Edit(number)
-    {
-        console.log('Edit ' + number);
+	/**
+	 * Edit action
+	 *
+	 * @param   {string}  number    Number pressed
+	 */
+	function Edit(number)
+	{
+		console.log('Edit ' + number);
 
-        if (number === 'p') {
-            if (editAction === 'p' && reductionType === 'percent'){
-                ValidateReduction();
-            } else {
-                editAction = 'p';
-            }
-            reductionType = 'percent';
-        } else if (number === 'a') {
-            if (editAction === 'a' && reductionType === 'amount'){
-                ValidateReduction();
-            } else {
-                editAction = 'a';
-            }
-            reductionType = 'amount';
-        }
+		if (number === 'p') {
+			if (editAction === 'p' && reductionType === 'percent'){
+				ValidateReduction();
+			} else {
+				editAction = 'p';
+			}
+			reductionType = 'percent';
+		} else if (number === 'a') {
+			if (editAction === 'a' && reductionType === 'amount'){
+				ValidateReduction();
+			} else {
+				editAction = 'a';
+			}
+			reductionType = 'amount';
+		}
 
-        if (editAction === 'p'){
+		if (editAction === 'p'){
 			jQuery('#reduction_type_percent').html(htmlBtnOK);
 			jQuery('#reduction_type_amount').html(htmlReductionAmount);
-        } else if (editAction === 'a'){
+		} else if (editAction === 'a'){
 			jQuery('#reduction_type_amount').html(htmlBtnOK);
 			jQuery("#reduction_type_percent").html(htmlReductionPercent);
-        } else {
+		} else {
 			jQuery('#reduction_type_percent').html(htmlReductionPercent);
 			jQuery('#reduction_type_amount').html(htmlReductionAmount);
-        }
-    }
+		}
+	}
 
-    /**
-     * Add a number in reduction input
-     *
-     * @param   {string}    reductionNumber     Number pressed
-     */
-    function AddReduction(reductionNumber)
-    {
-        console.log('AddReduction ' + reductionNumber);
+	/**
+	 * Add a number in reduction input
+	 *
+	 * @param   {string}    reductionNumber     Number pressed
+	 */
+	function AddReduction(reductionNumber)
+	{
+		console.log('AddReduction ' + reductionNumber);
 
-        reductionTotal += String(reductionNumber);
-        jQuery('#reduction_total').val(reductionTotal);
-    }
+		reductionTotal += String(reductionNumber);
+		jQuery('#reduction_total').val(reductionTotal);
+	}
 
-    /**
-     * Validate a reduction
-     */
+	/**
+	 * Validate a reduction
+	 */
 	function ValidateReduction()
 	{
-        console.log('ValidateReduction');
+		console.log('ValidateReduction');
 
-	    if (reductionTotal.length <= 0) {
-            console.error('Error no reduction');
-	        return;
-        }
+		if (reductionTotal.length <= 0) {
+			console.error('Error no reduction');
+			return;
+		}
 
-	    var reductionNumber = parseFloat(reductionTotal);
-	    if (isNaN(reductionNumber)) {
-            console.error('Error not a valid number :', reductionNumber);
-            return;
-        }
+		var reductionNumber = parseFloat(reductionTotal);
+		if (isNaN(reductionNumber)) {
+			console.error('Error not a valid number :', reductionNumber);
+			return;
+		}
 
-	    if (reductionType === 'percent') {
-            var invoiceid = <?php echo ($invoiceid > 0 ? $invoiceid : 0); ?>;
-            parent.$("#poslines").load("invoice.php?action=update_reduction_global&place=<?php echo $place; ?>&number="+reductionNumber+"&invoiceid="+invoiceid, function() {
-                Reset();
-                parent.$.colorbox.close();
-            });
-        } else if (reductionType === 'amount') {
-	        var desc = "<?php echo dol_escape_js($langs->transnoentities('Reduction')); ?>";
-            parent.$("#poslines").load("invoice.php?action=freezone&place=<?php echo $place; ?>&number=-"+reductionNumber+"&desc="+desc, function() {
-                Reset();
-                parent.$.colorbox.close();
-            });
-	    } else {
-	        console.error('Error bad reduction type :', reductionType);
-        }
+		if (reductionType === 'percent') {
+			var invoiceid = <?php echo ($invoiceid > 0 ? $invoiceid : 0); ?>;
+			parent.$("#poslines").load("invoice.php?action=update_reduction_global&place=<?php echo $place; ?>&number="+reductionNumber+"&invoiceid="+invoiceid, function() {
+				Reset();
+				parent.$.colorbox.close();
+			});
+		} else if (reductionType === 'amount') {
+			var desc = "<?php echo dol_escape_js($langs->transnoentities('Reduction')); ?>";
+			parent.$("#poslines").load("invoice.php?action=freezone&place=<?php echo $place; ?>&number=-"+reductionNumber+"&desc="+desc, function() {
+				Reset();
+				parent.$.colorbox.close();
+			});
+		} else {
+			console.error('Error bad reduction type :', reductionType);
+		}
 	}
 </script>
 
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index f33457992a7..9f98d5fbd7d 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -26,11 +26,21 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK'))	define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))	define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))	define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))	define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -51,8 +61,7 @@ $invoice->fetch($facid);
 $customer = new Societe($db);
 $customer->fetch($invoice->socid);
 
-if ($action == "send")
-{
+if ($action == "send") {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
@@ -87,9 +96,9 @@ top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 <script>
 function SendMail() {
 	$.ajax({
-        type: "GET",
-        url: "<?php print dol_buildpath('/takepos/send.php', 1).'?action=send&facid='.$facid.'&email='; ?>" + $("#email"). val(),
-    });
+		type: "GET",
+		url: "<?php print dol_buildpath('/takepos/send.php', 1).'?action=send&facid='.$facid.'&email='; ?>" + $("#email"). val(),
+	});
 	parent.$.colorbox.close();
 }
 
diff --git a/htdocs/takepos/smpcb.php b/htdocs/takepos/smpcb.php
index 1e02e9bc591..7cc504abdf0 100644
--- a/htdocs/takepos/smpcb.php
+++ b/htdocs/takepos/smpcb.php
@@ -21,11 +21,21 @@
  *	\brief      Page with the content for smpcb payment
  */
 
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	    define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../main.inc.php';