diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 2aa6072f2c2..3d73ea531b7 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -27,13 +27,13 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta","bills","other","main","accountancy"));
+$langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
 
 // Security check
 if (empty($conf->accounting->enabled)) {
@@ -41,16 +41,16 @@ if (empty($conf->accounting->enabled)) {
 }
 if ($user->socid > 0)
 	accessforbidden();
-if (! $user->rights->accounting->bind->write)
+if (!$user->rights->accounting->bind->write)
 	accessforbidden();
 
 
-$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
+$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
 else
 {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--;	// If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
@@ -77,20 +77,20 @@ if ($action == 'clean' || $action == 'validatehistory')
 {
 	// Clean database
 	$db->begin();
-	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
+	$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as fd";
 	$sql1 .= " SET fk_code_ventilation = 0";
 	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN';
 	$sql1 .= '	(SELECT accnt.rowid ';
-	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
-	$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
-	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ' AND accnt.entity = '.$conf->entity.')';
-	$sql1 .= ' AND fd.fk_facture IN (SELECT rowid FROM ' . MAIN_DB_PREFIX . 'facture WHERE entity = '.$conf->entity.')';
+	$sql1 .= '	FROM '.MAIN_DB_PREFIX.'accounting_account as accnt';
+	$sql1 .= '	INNER JOIN '.MAIN_DB_PREFIX.'accounting_system as syst';
+	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.$conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity.')';
+	$sql1 .= ' AND fd.fk_facture IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'facture WHERE entity = '.$conf->entity.')';
 	$sql1 .= ' AND fk_code_ventilation <> 0';
 
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
 	$resql1 = $db->query($sql1);
-	if (! $resql1) {
-		$error ++;
+	if (!$resql1) {
+		$error++;
 		$db->rollback();
 		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
@@ -121,26 +121,26 @@ if ($action == 'validatehistory') {
 
 	// Customer Invoice lines (must be same request than into page list.php for manual binding)
 	$sql = "SELECT f.rowid as facid, f.ref as ref, f.datef, f.type as ftype,";
-	$sql.= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
-	$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod,";
-	$sql.= " p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
-	$sql.= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export,";
-	$sql.= " co.code as country_code, co.label as country_label,";
-	$sql.= " s.tva_intra";
-	$sql.= " FROM " . MAIN_DB_PREFIX . "facture as f";
-	$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-	$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
-	$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "facturedet as l ON f.rowid = l.fk_facture";
-	$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
-	$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa  ON p.accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '" . $chartaccountcode."' AND aa.entity = " . $conf->entity;
-	$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '" . $chartaccountcode."' AND aa2.entity = " . $conf->entity;
-	$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '" . $chartaccountcode."' AND aa3.entity = " . $conf->entity;
-	$sql.= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
-	$sql.= " AND l.product_type <= 2";
+	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
+	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_sell as code_sell, p.tva_tx as tva_tx_prod,";
+	$sql .= " p.accountancy_code_sell_intra as code_sell_intra, p.accountancy_code_sell_export as code_sell_export,";
+	$sql .= " aa.rowid as aarowid, aa2.rowid as aarowid_intra, aa3.rowid as aarowid_export,";
+	$sql .= " co.code as country_code, co.label as country_label,";
+	$sql .= " s.tva_intra";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$chartaccountcode."' AND aa2.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$chartaccountcode."' AND aa3.entity = ".$conf->entity;
+	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
+	$sql .= " AND l.product_type <= 2";
 
 	dol_syslog('htdocs/accountancy/customer/index.php');
 	$result = $db->query($sql);
-	if (! $result) {
+	if (!$result) {
 		$error++;
 		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
@@ -172,12 +172,12 @@ if ($action == 'validatehistory') {
 
 			if ($objp->aarowid_suggest > 0)
 			{
-				$sqlupdate = "UPDATE " . MAIN_DB_PREFIX . "facturedet";
-				$sqlupdate.= " SET fk_code_ventilation = ".$objp->aarowid_suggest;
-				$sqlupdate.= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".$objp->rowid;
+				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facturedet";
+				$sqlupdate .= " SET fk_code_ventilation = ".$objp->aarowid_suggest;
+				$sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".$objp->rowid;
 
 				$resqlupdate = $db->query($sqlupdate);
-				if (! $resqlupdate)
+				if (!$resqlupdate)
 				{
 					$error++;
 					setEventMessages($db->lasterror(), null, 'errors');
@@ -278,11 +278,11 @@ if ($resql) {
 		}
 		else print $row[1];
 		print '</td>';
-		for($i = 2; $i <= 12; $i ++) {
-			print '<td class="nowrap right">' . price($row[$i]) . '</td>';
+		for ($i = 2; $i <= 12; $i++) {
+			print '<td class="nowrap right">'.price($row[$i]).'</td>';
 		}
-		print '<td class="nowrap right">' . price($row[13]) . '</td>';
-		print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
+		print '<td class="nowrap right">'.price($row[13]).'</td>';
+		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -338,7 +338,7 @@ $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 
-	while ( $row = $db->fetch_row($resql)) {
+	while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
 		if ($row[0] == 'tobind')
 		{
@@ -355,11 +355,11 @@ if ($resql) {
 		else print $row[1];
 		print '</td>';
 
-		for($i = 2; $i <= 12; $i++) {
-			print '<td class="nowrap right">' . price($row[$i]) . '</td>';
+		for ($i = 2; $i <= 12; $i++) {
+			print '<td class="nowrap right">'.price($row[$i]).'</td>';
 		}
-		print '<td class="nowrap right">' . price($row[13]) . '</td>';
-		print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
+		print '<td class="nowrap right">'.price($row[13]).'</td>';
+		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -413,11 +413,11 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 		$num = $db->num_rows($resql);
 
 		while ($row = $db->fetch_row($resql)) {
-			print '<tr><td>' . $row[0] . '</td>';
-			for($i = 1; $i <= 12; $i ++) {
-				print '<td class="nowrap right">' . price($row[$i]) . '</td>';
+			print '<tr><td>'.$row[0].'</td>';
+			for ($i = 1; $i <= 12; $i++) {
+				print '<td class="nowrap right">'.price($row[$i]).'</td>';
 			}
-			print '<td class="nowrap right"><b>' . price($row[13]) . '</b></td>';
+			print '<td class="nowrap right"><b>'.price($row[13]).'</b></td>';
 			print '</tr>';
 		}
 		$db->free($resql);
@@ -465,11 +465,11 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 			$num = $db->num_rows($resql);
 
 			while ($row = $db->fetch_row($resql)) {
-				print '<tr><td>' . $row[0] . '</td>';
-				for($i = 1; $i <= 12; $i ++) {
-					print '<td class="nowrap right">' . price(price2num($row[$i])) . '</td>';
+				print '<tr><td>'.$row[0].'</td>';
+				for ($i = 1; $i <= 12; $i++) {
+					print '<td class="nowrap right">'.price(price2num($row[$i])).'</td>';
 				}
-				print '<td class="nowrap right"><b>' . price(price2num($row[13])) . '</b></td>';
+				print '<td class="nowrap right"><b>'.price(price2num($row[13])).'</b></td>';
 				print '</tr>';
 			}
 			$db->free($resql);
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 9d32bbaebf4..10742b863d2 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -26,16 +26,16 @@
  */
 require '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("bills","compta","accountancy","productbatch"));
+$langs->loadLangs(array("bills", "compta", "accountancy", "productbatch"));
 
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
@@ -48,14 +48,14 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day=GETPOST("search_day", "int");
-$search_month=GETPOST("search_month", "int");
-$search_year=GETPOST("search_year", "int");
+$search_day = GETPOST("search_day", "int");
+$search_month = GETPOST("search_month", "int");
+$search_year = GETPOST("search_year", "int");
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
@@ -63,9 +63,9 @@ if (empty($page) || $page < 0) $page = 0;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 $offset = $limit * $page;
-if (! $sortfield)
+if (!$sortfield)
 	$sortfield = "f.datef, f.ref, fd.rowid";
-if (! $sortorder) {
+if (!$sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
 		$sortorder = "DESC";
 	}
@@ -74,7 +74,7 @@ if (! $sortorder) {
 // Security check
 if ($user->socid > 0)
 	accessforbidden();
-if (! $user->rights->accounting->bind->write)
+if (!$user->rights->accounting->bind->write)
 	accessforbidden();
 
 $formaccounting = new FormAccounting($db);
@@ -105,27 +105,27 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
 
-	if (! (GETPOST('account_parent', 'int') >= 0))
+	if (!(GETPOST('account_parent', 'int') >= 0))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->begin();
 
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as l";
-		$sql1 .= " SET l.fk_code_ventilation=" . (GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
-		$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
+		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as l";
+		$sql1 .= " SET l.fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
+		$sql1 .= ' WHERE l.rowid IN ('.implode(',', $changeaccount).')';
 
-		dol_syslog('accountancy/customer/lines.php::changeaccount sql= ' . $sql1);
+		dol_syslog('accountancy/customer/lines.php::changeaccount sql= '.$sql1);
 		$resql1 = $db->query($sql1);
-		if (! $resql1) {
-			$error ++;
+		if (!$resql1) {
+			$error++;
 			setEventMessages($db->lasterror(), null, 'errors');
 		}
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 			setEventMessages($langs->trans('Save'), null, 'mesgs');
 		} else {
@@ -133,7 +133,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		}
 
-		$account_parent = '';   // Protection to avoid to mass apply it a second time
+		$account_parent = ''; // Protection to avoid to mass apply it a second time
 	}
 }
 
@@ -145,7 +145,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 $form = new Form($db);
 $formother = new FormOther($db);
 
-llxHeader('', $langs->trans("CustomersVentilation") . ' - ' . $langs->trans("Dispatched"));
+llxHeader('', $langs->trans("CustomersVentilation").' - '.$langs->trans("Dispatched"));
 
 print '<script type="text/javascript">
 			$(function () {
@@ -168,28 +168,28 @@ print '<script type="text/javascript">
  * Customer Invoice lines
  */
 $sql = "SELECT f.rowid as facid, f.ref as ref, f.type, f.datef, f.ref_client,";
-$sql.= " fd.rowid, fd.description, fd.product_type as line_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.vat_src_code, fd.total_ttc,";
-$sql.= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
-$sql.= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
-$sql.= " fd.situation_percent,";
-$sql.= " co.code as country_code, co.label as country,";
-$sql.= " s.tva_intra";
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
-$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
-$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
-$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
-$sql.= " WHERE fd.fk_code_ventilation > 0";
-$sql.= " AND f.entity IN (" . getEntity('invoice', 0) . ")";   // We don't share object for accountancy
-$sql.= " AND f.fk_statut > 0";
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+$sql .= " fd.rowid, fd.description, fd.product_type as line_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.vat_src_code, fd.total_ttc,";
+$sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.code_client,";
+$sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number, aa.label as label_compte,";
+$sql .= " fd.situation_percent,";
+$sql .= " co.code as country_code, co.label as country,";
+$sql .= " s.tva_intra";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
+$sql .= " WHERE fd.fk_code_ventilation > 0";
+$sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
+$sql .= " AND f.fk_statut > 0";
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
 } else {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_STANDARD . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_STANDARD.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 }
 if ($search_lineid) {
     $sql .= natural_search("fd.rowid", $search_lineid, 1);
@@ -215,25 +215,25 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("fd.tva_tx", price2num($search_vat), 1);
 }
-$sql.=dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
+$sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
 	foreach ($arrayofcode as $key => $value)
 	{
-		$country_code_in_EEC.=($country_code_in_EEC ? "," : "")."'".$value."'";
-		if ($value != $mysoc->country_code) $country_code_in_EEC_without_me.=($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		$country_code_in_EEC .= ($country_code_in_EEC ? "," : "")."'".$value."'";
+		if ($value != $mysoc->country_code) $country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
 	}
 	if ($search_country == 'special_allnotme')     $sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
 	elseif ($search_country == 'special_eec')      $sql .= " AND co.code IN (".$country_code_in_EEC.")";
 	elseif ($search_country == 'special_eecnotme') $sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
 	elseif ($search_country == 'special_noteec')   $sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
-	else $sql .= natural_search(array("co.code","co.label"), $search_country);
+	else $sql .= natural_search(array("co.code", "co.label"), $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tvaintra);
 }
-$sql .= " AND f.entity IN (" . getEntity('invoice', 0) . ")";    // We don't share object for accountancy
+$sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
@@ -257,22 +257,22 @@ if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
 
-	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($search_invoice)	$param .= "&search_invoice=" . urlencode($search_invoice);
-	if ($search_ref)		$param .= "&search_ref=" . urlencode($search_ref);
-	if ($search_label)		$param .= "&search_label=" . urlencode($search_label);
-	if ($search_desc)		$param .= "&search_desc=" . urlencode($search_desc);
-	if ($search_account)	$param .= "&search_account=" . urlencode($search_account);
-	if ($search_vat)		$param .= "&search_vat=" . urlencode($search_vat);
+	$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_invoice)	$param .= "&search_invoice=".urlencode($search_invoice);
+	if ($search_ref)		$param .= "&search_ref=".urlencode($search_ref);
+	if ($search_label)		$param .= "&search_label=".urlencode($search_label);
+	if ($search_desc)		$param .= "&search_desc=".urlencode($search_desc);
+	if ($search_account)	$param .= "&search_account=".urlencode($search_account);
+	if ($search_vat)		$param .= "&search_vat=".urlencode($search_vat);
 	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
 	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
 	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
-	if ($search_country)  	$param .= "&search_country=" . urlencode($search_country);
-	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
+	if ($search_country)  	$param .= "&search_country=".urlencode($search_country);
+	if ($search_tvaintra)	$param .= "&search_tvaintra=".urlencode($search_tvaintra);
 
-	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -282,40 +282,40 @@ if ($result) {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
-	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneCustomer") . '</span><br>';
+	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneCustomer").'</span><br>';
 
-	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
+	print '<br><div class="inline-block divButAction">'.$langs->trans("ChangeAccount").'<br>';
 	print $formaccounting->select_account($account_parent, 'account_parent', 2, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone valignmiddle');
-	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '"/></div>';
+	print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("ChangeBinding").'"/></div>';
 
 	$moreforfilter = '';
 
 	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="'.dol_escape_htmltag($search_lineid).'""></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
 	print '<td class="liste_titre center nowraponall">';
-    if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
         print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
     }
    	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
    	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" placeholder="%" name="search_vat" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
+	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
+	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" placeholder="%" name="search_vat" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
 	print '<td class="liste_titre">';
 	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth200', 'code2', 1, 0, 1);
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="' . dol_escape_htmltag($search_tvaintra) . '"></td>';
-	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
+	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
 	print '<td class="liste_titre center">';
-	$searchpicto=$form->showFilterButtons();
+	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print "</td></tr>\n";
 
@@ -331,15 +331,15 @@ if ($result) {
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder, 'center ');
-	$clickpicto=$form->showCheckAddButtons();
+	$clickpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($clickpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
 	$facture_static = new Facture($db);
 	$product_static = new Product($db);
 
-	while ( $objp = $db->fetch_object($result) ) {
-		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label_compte;
+	while ($objp = $db->fetch_object($result)) {
+		$codecompta = length_accountg($objp->account_number).' - '.$objp->label_compte;
 
 		$facture_static->ref = $objp->ref;
 		$facture_static->id = $objp->facid;
@@ -353,13 +353,13 @@ if ($result) {
 		print '<tr class="oddeven">';
 
 		// Line id
-		print '<td>' . $objp->rowid . '</td>';
+		print '<td>'.$objp->rowid.'</td>';
 
 		// Ref Invoice
-		print '<td class="nowraponall">' . $facture_static->getNomUrl(1) . '</td>';
+		print '<td class="nowraponall">'.$facture_static->getNomUrl(1).'</td>';
 
 		// Date invoice
-		print '<td class="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
+		print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day').'</td>';
 
 		// Ref Product
 		print '<td>';
@@ -374,30 +374,30 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="nowrap right">' . price($objp->total_ht) . '</td>';
+		print '<td class="nowrap right">'.price($objp->total_ht).'</td>';
 
-		print '<td class="right">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
+		print '<td class="right">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
 		// Country
 		print '<td>';
 		if ($objp->country_code)
 		{
-			print $langs->trans("Country".$objp->country_code) .' ('.$objp->country_code.')';
+			print $langs->trans("Country".$objp->country_code).' ('.$objp->country_code.')';
 		}
 		print '</td>';
 
-		print '<td>' . $objp->tva_intra . '</td>';
+		print '<td>'.$objp->tva_intra.'</td>';
 
 		print '<td class="center">';
-		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')).'">';
+		print $codecompta.' <a href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a>';
 		print '</td>';
 
-		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';
 
 		print "</tr>";
-		$i ++;
+		$i++;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 945c5567b0b..848a2270171 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -25,13 +25,13 @@
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta","bills","other","main","accountancy"));
+$langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
 
 // Security check
 if (empty($conf->accounting->enabled)) {
@@ -39,16 +39,16 @@ if (empty($conf->accounting->enabled)) {
 }
 if ($user->socid > 0)
 	accessforbidden();
-if (! $user->rights->accounting->bind->write)
+if (!$user->rights->accounting->bind->write)
 	accessforbidden();
 
 
-$month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
+$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
 else
 {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--;	// If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
@@ -75,19 +75,19 @@ if ($action == 'clean' || $action == 'validatehistory')
 {
 	// Clean database
 	$db->begin();
-	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
+	$sql1 = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det as fd";
 	$sql1 .= " SET fk_code_ventilation = 0";
 	$sql1 .= ' WHERE fd.fk_code_ventilation NOT IN';
 	$sql1 .= '	(SELECT accnt.rowid ';
-	$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
-	$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
-	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ' AND accnt.entity = '.$conf->entity.')';
-	$sql1 .= ' AND fd.fk_facture_fourn IN (SELECT rowid FROM ' . MAIN_DB_PREFIX . 'facture_fourn WHERE entity = '.$conf->entity.')';
+	$sql1 .= '	FROM '.MAIN_DB_PREFIX.'accounting_account as accnt';
+	$sql1 .= '	INNER JOIN '.MAIN_DB_PREFIX.'accounting_system as syst';
+	$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.$conf->global->CHARTOFACCOUNTS.' AND accnt.entity = '.$conf->entity.')';
+	$sql1 .= ' AND fd.fk_facture_fourn IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE entity = '.$conf->entity.')';
 	$sql1 .= ' AND fk_code_ventilation <> 0';
 	dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
 	$resql1 = $db->query($sql1);
-	if (! $resql1) {
-		$error ++;
+	if (!$resql1) {
+		$error++;
 		$db->rollback();
 		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
@@ -118,24 +118,24 @@ if ($action == 'validatehistory') {
 
 	// Supplier Invoice Lines (must be same request than into page list.php for manual binding)
 	$sql = "SELECT f.rowid as facid, f.ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.type as ftype,";
-	$sql.= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
-	$sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy, p.tva_tx as tva_tx_prod,";
-	$sql.= " aa.rowid as aarowid,";
-	$sql.= " co.code as country_code, co.label as country_label,";
-	$sql.= " s.tva_intra";
-	$sql.= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f";
-	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
-	$sql.= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
-	$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
-	$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON p.accountancy_code_buy = aa.account_number AND aa.active = 1 AND aa.fk_pcg_version = '" . $chartaccountcode."' AND aa.entity = " . $conf->entity;
-	$sql.= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
-	$sql.= " AND l.product_type <= 2";
+	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
+	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.accountancy_code_buy as code_buy, p.tva_tx as tva_tx_prod,";
+	$sql .= " aa.rowid as aarowid,";
+	$sql .= " co.code as country_code, co.label as country_label,";
+	$sql .= " s.tva_intra";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON p.accountancy_code_buy = aa.account_number AND aa.active = 1 AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
+	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
+	$sql .= " AND l.product_type <= 2";
 
 	dol_syslog('htdocs/accountancy/supplier/index.php');
 
 	$result = $db->query($sql);
-	if (! $result) {
+	if (!$result) {
 		$error++;
 		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
@@ -171,12 +171,12 @@ if ($action == 'validatehistory') {
 
 			if ($objp->aarowid_suggest > 0)
 			{
-				$sqlupdate = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
-				$sqlupdate.= " SET fk_code_ventilation = ".$objp->aarowid_suggest;
-				$sqlupdate.= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".$objp->rowid;
+				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
+				$sqlupdate .= " SET fk_code_ventilation = ".$objp->aarowid_suggest;
+				$sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".$objp->rowid;
 
 				$resqlupdate = $db->query($sqlupdate);
-				if (! $resqlupdate)
+				if (!$resqlupdate)
 				{
 					$error++;
 					setEventMessages($db->lasterror(), null, 'errors');
@@ -205,18 +205,18 @@ if ($action == 'validatehistory') {
 
 llxHeader('', $langs->trans("SuppliersVentilation"));
 
-$textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
-$textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
+$textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current - 1).'">'.img_previous().'</a>';
+$textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current + 1).'">'.img_next().'</a>';
 
-print load_fiche_titre($langs->trans("SuppliersVentilation") . " " . $textprevyear . "&nbsp;" . $langs->trans("Year") . "&nbsp;" . $year_start . "&nbsp;" . $textnextyear, '', 'title_accountancy');
+print load_fiche_titre($langs->trans("SuppliersVentilation")." ".$textprevyear."&nbsp;".$langs->trans("Year")."&nbsp;".$year_start."&nbsp;".$textnextyear, '', 'title_accountancy');
 
-print '<span class="opacitymedium">'.$langs->trans("DescVentilSupplier") . '<br>';
-print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")) . '<br>';
+print '<span class="opacitymedium">'.$langs->trans("DescVentilSupplier").'<br>';
+print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'<br>';
 print '</span><br>';
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
+$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?year='.$year_current.'&action=validatehistory">'.$langs->trans("ValidateHistory").'</a>';
 
 
 print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
@@ -256,7 +256,7 @@ $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 
-	while ( $row = $db->fetch_row($resql)) {
+	while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
 		if ($row[0] == 'tobind')
 		{
@@ -271,11 +271,11 @@ if ($resql) {
 		}
 		else print $row[1];
 		print '</td>';
-		for($i = 2; $i <= 12; $i ++) {
-			print '<td class="nowrap right">' . price($row[$i]) . '</td>';
+		for ($i = 2; $i <= 12; $i++) {
+			print '<td class="nowrap right">'.price($row[$i]).'</td>';
 		}
-		print '<td class="nowrap right">' . price($row[13]) . '</td>';
-		print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
+		print '<td class="nowrap right">'.price($row[13]).'</td>';
+		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -326,7 +326,7 @@ $resql = $db->query($sql);
 if ($resql) {
     $num = $db->num_rows($resql);
 
-    while ( $row = $db->fetch_row($resql)) {
+    while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
 		if ($row[0] == 'tobind')
 		{
@@ -341,11 +341,11 @@ if ($resql) {
 		}
 		else print $row[1];
 		print '</td>';
-    	for($i = 2; $i <= 12; $i++) {
-            print '<td class="nowrap right">' . price($row[$i]) . '</td>';
+    	for ($i = 2; $i <= 12; $i++) {
+            print '<td class="nowrap right">'.price($row[$i]).'</td>';
         }
-        print '<td class="nowrap right">' . price($row[13]) . '</td>';
-        print '<td class="nowrap right"><b>' . price($row[14]) . '</b></td>';
+        print '<td class="nowrap right">'.price($row[13]).'</td>';
+        print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
         print '</tr>';
     }
     $db->free($resql);
@@ -395,11 +395,11 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
     	$num = $db->num_rows($resql);
 
     	while ($row = $db->fetch_row($resql)) {
-    		print '<tr><td>' . $row[0] . '</td>';
-            for($i = 1; $i <= 12; $i ++) {
-    			print '<td class="nowrap right">' . price($row[$i]) . '</td>';
+    		print '<tr><td>'.$row[0].'</td>';
+            for ($i = 1; $i <= 12; $i++) {
+    			print '<td class="nowrap right">'.price($row[$i]).'</td>';
     		}
-    		print '<td class="nowrap right"><b>' . price($row[13]) . '</b></td>';
+    		print '<td class="nowrap right"><b>'.price($row[13]).'</b></td>';
     		print '</tr>';
     	}
         $db->free($resql);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 00ac4d02d73..e6ef6ac1291 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -26,18 +26,18 @@
  */
 require '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta","bills","other","accountancy","productbatch"));
+$langs->loadLangs(array("compta", "bills", "other", "accountancy", "productbatch"));
 
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
@@ -50,14 +50,14 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day=GETPOST("search_day", "int");
-$search_month=GETPOST("search_month", "int");
-$search_year=GETPOST("search_year", "int");
+$search_day = GETPOST("search_day", "int");
+$search_month = GETPOST("search_month", "int");
+$search_year = GETPOST("search_year", "int");
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
@@ -65,9 +65,9 @@ if (empty($page) || $page < 0) $page = 0;
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield)
+if (!$sortfield)
 	$sortfield = "f.datef, f.ref, l.rowid";
-if (! $sortorder) {
+if (!$sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
 		$sortorder = "DESC";
 	}
@@ -76,7 +76,7 @@ if (! $sortorder) {
 // Security check
 if ($user->socid > 0)
 	accessforbidden();
-if (! $user->rights->accounting->bind->write)
+if (!$user->rights->accounting->bind->write)
 	accessforbidden();
 
 $formaccounting = new FormAccounting($db);
@@ -107,28 +107,28 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
 
-	if (! (GETPOST('account_parent', 'int') >= 0))
+	if (!(GETPOST('account_parent', 'int') >= 0))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
 
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->begin();
 
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as l";
-		$sql1 .= " SET l.fk_code_ventilation=" . (GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
-		$sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')';
+		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det as l";
+		$sql1 .= " SET l.fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
+		$sql1 .= ' WHERE l.rowid IN ('.implode(',', $changeaccount).')';
 
-		dol_syslog('accountancy/supplier/lines.php::changeaccount sql= ' . $sql1);
+		dol_syslog('accountancy/supplier/lines.php::changeaccount sql= '.$sql1);
 		$resql1 = $db->query($sql1);
-		if (! $resql1) {
-			$error ++;
+		if (!$resql1) {
+			$error++;
 			setEventMessages($db->lasterror(), null, 'errors');
 		}
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 			setEventMessages($langs->trans('Save'), null, 'mesgs');
 		} else {
@@ -136,7 +136,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		}
 
-		$account_parent = '';   // Protection to avoid to mass apply it a second time
+		$account_parent = ''; // Protection to avoid to mass apply it a second time
 	}
 }
 
@@ -148,7 +148,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 $form = new Form($db);
 $formother = new FormOther($db);
 
-llxHeader('', $langs->trans("SuppliersVentilation") . ' - ' . $langs->trans("Dispatched"));
+llxHeader('', $langs->trans("SuppliersVentilation").' - '.$langs->trans("Dispatched"));
 
 print '<script type="text/javascript">
 			$(function () {
@@ -171,21 +171,21 @@ print '<script type="text/javascript">
  * Supplier Invoice lines
  */
 $sql = "SELECT f.rowid as facid, f.ref as ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.fk_soc,";
-$sql.= " l.rowid, l.fk_product, l.product_type as line_type, l.description, l.total_ht , l.qty, l.tva_tx, l.vat_src_code,";
-$sql.= " aa.label, aa.account_number, ";
-$sql.= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.fk_product_type as type,";
-$sql.= " co.code as country_code, co.label as country,";
-$sql.= " s.tva_intra";
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as l";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = l.fk_product";
-$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
-$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn";
-$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_country as co ON co.rowid = s.fk_pays ";
-$sql.= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
+$sql .= " l.rowid, l.fk_product, l.product_type as line_type, l.description, l.total_ht , l.qty, l.tva_tx, l.vat_src_code,";
+$sql .= " aa.label, aa.account_number, ";
+$sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.fk_product_type as type,";
+$sql .= " co.code as country_code, co.label as country,";
+$sql .= " s.tva_intra";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
+$sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";
 if ($search_lineid) {
     $sql .= natural_search("l.rowid", $search_lineid, 1);
 }
@@ -210,30 +210,30 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
 }
-$sql.=dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
+$sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
 	foreach ($arrayofcode as $key => $value)
 	{
-		$country_code_in_EEC.=($country_code_in_EEC ? "," : "")."'".$value."'";
-		if ($value != $mysoc->country_code) $country_code_in_EEC_without_me.=($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		$country_code_in_EEC .= ($country_code_in_EEC ? "," : "")."'".$value."'";
+		if ($value != $mysoc->country_code) $country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
 	}
 	if ($search_country == 'special_allnotme')     $sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
 	elseif ($search_country == 'special_eec')      $sql .= " AND co.code IN (".$country_code_in_EEC.")";
 	elseif ($search_country == 'special_eecnotme') $sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
 	elseif ($search_country == 'special_noteec')   $sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
-	else $sql .= natural_search(array("co.code","co.label"), $search_country);
+	else $sql .= natural_search(array("co.code", "co.label"), $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tvaintra);
 }
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
+$sql .= " AND f.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
 
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -259,22 +259,22 @@ if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
 
-	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($search_invoice)	$param .= "&search_invoice=" . urlencode($search_invoice);
-	if ($search_ref)		$param .= "&search_ref=" . urlencode($search_ref);
-	if ($search_label)		$param .= "&search_label=" . urlencode($search_label);
-	if ($search_desc)		$param .= "&search_desc=" . urlencode($search_desc);
-	if ($search_account)	$param .= "&search_account=" . urlencode($search_account);
-	if ($search_vat)		$param .= "&search_vat=" . urlencode($search_vat);
+	$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_invoice)	$param .= "&search_invoice=".urlencode($search_invoice);
+	if ($search_ref)		$param .= "&search_ref=".urlencode($search_ref);
+	if ($search_label)		$param .= "&search_label=".urlencode($search_label);
+	if ($search_desc)		$param .= "&search_desc=".urlencode($search_desc);
+	if ($search_account)	$param .= "&search_account=".urlencode($search_account);
+	if ($search_vat)		$param .= "&search_vat=".urlencode($search_vat);
 	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
 	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
 	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
-	if ($search_country) 	$param .= "&search_country=" . urlencode($search_country);
-	if ($search_tvaintra)	$param .= "&search_tvaintra=" . urlencode($search_tvaintra);
+	if ($search_country) 	$param .= "&search_country=".urlencode($search_country);
+	if ($search_tvaintra)	$param .= "&search_tvaintra=".urlencode($search_tvaintra);
 
-	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -285,39 +285,39 @@ if ($result) {
 
 	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
-	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneSupplier") . '</span><br>';
+	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneSupplier").'</span><br>';
 
-	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
+	print '<br><div class="inline-block divButAction">'.$langs->trans("ChangeAccount").'<br>';
 	print $formaccounting->select_account($account_parent, 'account_parent', 2, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone valignmiddle');
-	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
+	print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("ChangeBinding").'" /></div>';
 
 	$moreforfilter = '';
 
 	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// We add search filter
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="' . dol_escape_htmltag($search_lineid) . '""></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="' . dol_escape_htmltag($search_invoice) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="'.dol_escape_htmltag($search_lineid).'""></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre center nowraponall">';
-   	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
+   	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
    	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
    	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="' . dol_escape_htmltag($search_ref) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="' . dol_escape_htmltag($search_vat) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
+	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
+	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
 	print '<td class="liste_titre">';
 	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth200', 'code2', 1, 0, 1);
 	//	print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="' . dol_escape_htmltag($search_tvaintra) . '"></td>';
-	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
+	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
 	print '<td class="liste_titre center">';
-    $searchpicto=$form->showFilterButtons();
+    $searchpicto = $form->showFilterButtons();
     print $searchpicto;
     print '</td>';
 	print "</tr>\n";
@@ -335,7 +335,7 @@ if ($result) {
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder, 'center ');
-	$checkpicto=$form->showCheckAddButtons();
+	$checkpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
@@ -345,7 +345,7 @@ if ($result) {
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
-		$codecompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
+		$codecompta = length_accountg($objp->account_number).' - '.$objp->label;
 
 		$facturefournisseur_static->ref = $objp->ref;
 		$facturefournisseur_static->id = $objp->facid;
@@ -358,17 +358,17 @@ if ($result) {
 		print '<tr class="oddeven">';
 
 		// Line id
-		print '<td>' . $objp->rowid . '</td>';
+		print '<td>'.$objp->rowid.'</td>';
 
 		// Ref Invoice
-		print '<td class="nowraponall">' . $facturefournisseur_static->getNomUrl(1) . '</td>';
+		print '<td class="nowraponall">'.$facturefournisseur_static->getNomUrl(1).'</td>';
 
 		print '<td class="tdoverflowonsmartphone">';
 		print $objp->invoice_label;
 		print '</td>';
 
 		// Date invoice
-		print '<td class="center">' . dol_print_date($db->jdate($objp->datef), 'day') . '</td>';
+		print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day').'</td>';
 
 		// Ref product
 		print '<td>';
@@ -384,27 +384,27 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="nowrap right">' . price($objp->total_ht) . '</td>';
+		print '<td class="nowrap right">'.price($objp->total_ht).'</td>';
 
-		print '<td class="right">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
+		print '<td class="right">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
 		print '<td>';
 		if ($objp->country_code)
 		{
-			print $langs->trans("Country".$objp->country_code) .' ('.$objp->country_code.')';
+			print $langs->trans("Country".$objp->country_code).' ('.$objp->country_code.')';
 		}
 		print '</td>';
 
-		print '<td>' . $objp->tva_intra . '</td>';
+		print '<td>'.$objp->tva_intra.'</td>';
 
 		print '<td class="center">';
-		print $codecompta . ' <a href="./card.php?id=' . $objp->rowid  . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')) . '">';
+		print $codecompta.' <a href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
-		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';
 
 		print '</tr>';
-		$i ++;
+		$i++;
 	}
     print '</table>';
     print "</div>";
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index a264288c111..72ad45921d5 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -129,22 +129,22 @@ class Setup extends DolibarrApi
         $list = array();
 
         $sql = "SELECT id, code, type, libelle as label, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
-        $sql.= " WHERE t.entity IN (".getEntity('c_paiement').")";
-        $sql.= " AND t.active = ".$active;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
+        $sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
+        $sql .= " AND t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
             }
-              $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+              $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -198,19 +198,19 @@ class Setup extends DolibarrApi
         // Note: The filter is not applied in the SQL request because it must
         // be applied to the translated names, not to the names in database.
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_country as t";
-        $sql.=" WHERE 1 = 1";
+        $sql .= " WHERE 1 = 1";
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -347,21 +347,21 @@ class Setup extends DolibarrApi
         $list = array();
 
         $sql = "SELECT rowid, code, label";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_availability as t";
-        $sql.= " WHERE t.active = ".$active;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_availability as t";
+        $sql .= " WHERE t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
             }
-                  $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+                  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -515,23 +515,23 @@ class Setup extends DolibarrApi
         $list = array();
 
         $sql = "SELECT id, code, type, libelle as label, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
-        $sql.= " WHERE t.active = ".$active;
-        if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
+        $sql .= " WHERE t.active = ".$active;
+        if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -579,23 +579,23 @@ class Setup extends DolibarrApi
         $list = array();
 
         $sql = "SELECT rowid, code, element as type, libelle as label, source, module, position";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
-        $sql.= " WHERE t.active = ".$active;
-        if ($type) $sql.=" AND type LIKE '%" . $this->db->escape($type) . "%'";
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
+        $sql .= " WHERE t.active = ".$active;
+        if ($type) $sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
+        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -642,22 +642,22 @@ class Setup extends DolibarrApi
         $list = array();
 
         $sql = "SELECT rowid, code, label, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_civility as t";
-        $sql.= " WHERE t.active = ".$active;
-        if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
+        $sql .= " WHERE t.active = ".$active;
+        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -703,33 +703,33 @@ class Setup extends DolibarrApi
     {
         $list = array();
         $sql = "SELECT t.code_iso, t.label, t.unicode";
-        if (!empty($multicurrency)) $sql.= " , cr.date_sync, cr.rate ";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
+        if (!empty($multicurrency)) $sql .= " , cr.date_sync, cr.rate ";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
         if (!empty($multicurrency)) {
-            $sql.= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
-            $sql.= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
+            $sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
+            $sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
         }
-        $sql.= " WHERE t.active = ".$active;
+        $sql .= " WHERE t.active = ".$active;
         if (!empty($multicurrency)) {
-            $sql.= " AND m.entity IN (".getEntity('multicurrency').")";
+            $sql .= " AND m.entity IN (".getEntity('multicurrency').")";
             if (!empty($multicurrency) && $multicurrency != 2) {
-                $sql.= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
+                $sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
             }
         }
 
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -772,27 +772,27 @@ class Setup extends DolibarrApi
     {
         $list = array();
 
-        if ($type == 'thirdparty') $type='societe';
-        if ($type == 'contact') $type='socpeople';
+        if ($type == 'thirdparty') $type = 'societe';
+        if ($type == 'contact') $type = 'socpeople';
 
         $sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
-        $sql.= " FROM ".MAIN_DB_PREFIX."extrafields as t";
-        $sql.= " WHERE t.entity IN (".getEntity('extrafields').")";
-        if (! empty($type)) $sql.= " AND t.elementtype = '".$this->db->escape($type)."'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
+        $sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
+        if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
         // Add sql filters
         if ($sqlfilters)
         {
-        	if (! DolibarrApi::_checkFilters($sqlfilters))
+        	if (!DolibarrApi::_checkFilters($sqlfilters))
         	{
         		throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
         	}
-        	$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-        	$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        	$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+        	$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
         	if ($this->db->num_rows($resql))
@@ -800,19 +800,19 @@ class Setup extends DolibarrApi
         		while ($tab = $this->db->fetch_object($resql))
         		{
         			// New usage
-        			$list[$tab->elementtype][$tab->name]['type']=$tab->type;
-        			$list[$tab->elementtype][$tab->name]['label']=$tab->label;
-        			$list[$tab->elementtype][$tab->name]['size']=$tab->size;
-        			$list[$tab->elementtype][$tab->name]['elementtype']=$tab->elementtype;
-        			$list[$tab->elementtype][$tab->name]['default']=$tab->fielddefault;
-        			$list[$tab->elementtype][$tab->name]['computed']=$tab->fieldcomputed;
-        			$list[$tab->elementtype][$tab->name]['unique']=$tab->fieldunique;
-        			$list[$tab->elementtype][$tab->name]['required']=$tab->fieldrequired;
-        			$list[$tab->elementtype][$tab->name]['param']=($tab->param ? unserialize($tab->param) : '');
-        			$list[$tab->elementtype][$tab->name]['pos']=$tab->pos;
-        			$list[$tab->elementtype][$tab->name]['alwayseditable']=$tab->alwayseditable;
-        			$list[$tab->elementtype][$tab->name]['perms']=$tab->perms;
-        			$list[$tab->elementtype][$tab->name]['list']=$tab->list;
+        			$list[$tab->elementtype][$tab->name]['type'] = $tab->type;
+        			$list[$tab->elementtype][$tab->name]['label'] = $tab->label;
+        			$list[$tab->elementtype][$tab->name]['size'] = $tab->size;
+        			$list[$tab->elementtype][$tab->name]['elementtype'] = $tab->elementtype;
+        			$list[$tab->elementtype][$tab->name]['default'] = $tab->fielddefault;
+        			$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
+        			$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
+        			$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
+        			$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? unserialize($tab->param) : '');
+        			$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
+        			$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
+        			$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
+        			$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
         		}
         	}
         }
@@ -821,7 +821,7 @@ class Setup extends DolibarrApi
             throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
         }
 
-        if (! count($list))
+        if (!count($list))
         {
         	throw new RestException(404, 'No extrafield found');
         }
@@ -852,23 +852,23 @@ class Setup extends DolibarrApi
         $list = array();
 
         $sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
-        $sql.= " AND t.active = ".$active;
-        if ($zipcode) $sql.=" AND t.zip LIKE '%" . $this->db->escape($zipcode) . "%'";
-        if ($town)    $sql.=" AND t.town LIKE '%" . $this->db->escape($town) . "%'";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
+        $sql .= " AND t.active = ".$active;
+        if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
+        if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -916,22 +916,22 @@ class Setup extends DolibarrApi
         $list = array();
 
         $sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-        $sql.= " WHERE t.entity IN (".getEntity('c_payment_term').")";
-        $sql.= " AND t.active = ".$active;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+        $sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
+        $sql .= " AND t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-                $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -977,18 +977,18 @@ class Setup extends DolibarrApi
         $list = array();
 
         $sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
-        $sql.= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
-        $sql.= " AND t.active = ".$active;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
+        $sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
+        $sql .= " AND t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-                $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
@@ -1038,21 +1038,21 @@ class Setup extends DolibarrApi
         $list = array();
         //TODO link with multicurrency module
         $sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_units as t";
-        $sql.= " WHERE t.active = ".$active;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
+        $sql .= " WHERE t.active = ".$active;
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
 
-        $sql.= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -1165,21 +1165,21 @@ class Setup extends DolibarrApi
     	$list = array();
 
     	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
-        $sql.= " WHERE t.active = ".$active;
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
+        $sql .= " WHERE t.active = ".$active;
     	// Add sql filters
     	if ($sqlfilters)
     	{
-    		if (! DolibarrApi::_checkFilters($sqlfilters))
+    		if (!DolibarrApi::_checkFilters($sqlfilters))
     		{
     			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
     		}
-    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
     	}
 
 
-    	$sql.= $this->db->order($sortfield, $sortorder);
+    	$sql .= $this->db->order($sortfield, $sortorder);
 
     	if ($limit) {
     		if ($page < 0) {
@@ -1225,21 +1225,21 @@ class Setup extends DolibarrApi
     	$list = array();
 
     	$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
-        $sql.= " WHERE t.active = ".$active;
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
+        $sql .= " WHERE t.active = ".$active;
     	// Add sql filters
     	if ($sqlfilters)
     	{
-    		if (! DolibarrApi::_checkFilters($sqlfilters))
+    		if (!DolibarrApi::_checkFilters($sqlfilters))
     		{
     			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
     		}
-    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
     	}
 
 
-    	$sql.= $this->db->order($sortfield, $sortorder);
+    	$sql .= $this->db->order($sortfield, $sortorder);
 
     	if ($limit) {
     		if ($page < 0) {
@@ -1285,23 +1285,23 @@ class Setup extends DolibarrApi
     	$list = array();
 
     	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
-        $sql.= " WHERE t.active = ".$active;
-    	if ($type) $sql.=" AND t.type LIKE '%" . $this->db->escape($type) . "%'";
-    	if ($module)    $sql.=" AND t.module LIKE '%" . $this->db->escape($module) . "%'";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
+        $sql .= " WHERE t.active = ".$active;
+    	if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+    	if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
     	// Add sql filters
     	if ($sqlfilters)
     	{
-    		if (! DolibarrApi::_checkFilters($sqlfilters))
+    		if (!DolibarrApi::_checkFilters($sqlfilters))
     		{
     			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
     		}
-    		$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
     	}
 
 
-    	$sql.= $this->db->order($sortfield, $sortorder);
+    	$sql .= $this->db->order($sortfield, $sortorder);
 
     	if ($limit) {
     		if ($page < 0) {
@@ -1342,7 +1342,7 @@ class Setup extends DolibarrApi
     {
     	global $langs, $conf;
 
-    	if (! DolibarrApiAccess::$user->admin
+    	if (!DolibarrApiAccess::$user->admin
     		&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
     	{
     		throw new RestException(503, 'Error API open to admin users only or to login user defined with constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
@@ -1360,13 +1360,13 @@ class Setup extends DolibarrApi
     	$file_list = array('missing' => array(), 'updated' => array());
 
     	// Local file to compare to
-    	$xmlshortfile = GETPOST('xmlshortfile')?GETPOST('xmlshortfile'):'/install/filelist-'.DOL_VERSION.'.xml';
+    	$xmlshortfile = GETPOST('xmlshortfile') ?GETPOST('xmlshortfile') : '/install/filelist-'.DOL_VERSION.'.xml';
     	$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
     	// Remote file to compare to
     	$xmlremote = ($target == 'default' ? '' : $target);
-    	if (empty($xmlremote) && ! empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
-    	$param='MAIN_FILECHECK_URL_'.DOL_VERSION;
-    	if (empty($xmlremote) && ! empty($conf->global->$param)) $xmlremote = $conf->global->$param;
+    	if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+    	$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
+    	if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
     	if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
 
     	if ($target == 'local')
@@ -1377,7 +1377,7 @@ class Setup extends DolibarrApi
     		}
     		else
     		{
-    			throw new RestException(500, $langs->trans('XmlNotFound') . ': ' . $xmlfile);
+    			throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
     		}
     	}
     	else
@@ -1385,7 +1385,7 @@ class Setup extends DolibarrApi
     		$xmlarray = getURLContent($xmlremote);
 
     		// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-    		if (! $xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
+    		if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
     		{
     			$xmlfile = $xmlarray['content'];
     			//print "xmlfilestart".$xmlfile."endxmlfile";
@@ -1393,7 +1393,7 @@ class Setup extends DolibarrApi
     		}
     		else
     		{
-    			$errormsg=$langs->trans('XmlNotFound') . ': ' . $xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
+    			$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
     			throw new RestException(500, $errormsg);
     		}
     	}
@@ -1409,83 +1409,83 @@ class Setup extends DolibarrApi
     		// Forced constants
     		if (is_object($xml->dolibarr_constants[0]))
     		{
-    			$out.=load_fiche_titre($langs->trans("ForcedConstants"));
+    			$out .= load_fiche_titre($langs->trans("ForcedConstants"));
 
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Constant") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedValue") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("Value") . '</td>';
-    			$out.='</tr>'."\n";
+    			$out .= '<div class="div-table-responsive-no-min">';
+    			$out .= '<table class="noborder">';
+    			$out .= '<tr class="liste_titre">';
+    			$out .= '<td>#</td>';
+    			$out .= '<td>'.$langs->trans("Constant").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("ExpectedValue").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("Value").'</td>';
+    			$out .= '</tr>'."\n";
 
     			$i = 0;
     			foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
     			{
-    				$constname=$constant['name'];
-    				$constvalue=(string) $constant;
-    				$constvalue = (empty($constvalue)?'0':$constvalue);
+    				$constname = $constant['name'];
+    				$constvalue = (string) $constant;
+    				$constvalue = (empty($constvalue) ? '0' : $constvalue);
     				// Value found
-    				$value='';
-    				if ($constname && $conf->global->$constname != '') $value=$conf->global->$constname;
-    				$valueforchecksum=(empty($value)?'0':$value);
+    				$value = '';
+    				if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
+    				$valueforchecksum = (empty($value) ? '0' : $value);
 
-    				$checksumconcat[]=$valueforchecksum;
+    				$checksumconcat[] = $valueforchecksum;
 
     				$i++;
-    				$out.='<tr class="oddeven">';
-    				$out.='<td>'.$i.'</td>' . "\n";
-    				$out.='<td>'.$constname.'</td>' . "\n";
-    				$out.='<td align="center">'.$constvalue.'</td>' . "\n";
-    				$out.='<td align="center">'.$valueforchecksum.'</td>' . "\n";
-    				$out.="</tr>\n";
+    				$out .= '<tr class="oddeven">';
+    				$out .= '<td>'.$i.'</td>'."\n";
+    				$out .= '<td>'.$constname.'</td>'."\n";
+    				$out .= '<td align="center">'.$constvalue.'</td>'."\n";
+    				$out .= '<td align="center">'.$valueforchecksum.'</td>'."\n";
+    				$out .= "</tr>\n";
     			}
 
-    			if ($i==0)
+    			if ($i == 0)
     			{
-    				$out.='<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+    				$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
-    			$out.='</table>';
-    			$out.='</div>';
+    			$out .= '</table>';
+    			$out .= '</div>';
 
-    			$out.='<br>';
+    			$out .= '<br>';
     		}
 
     		// Scan htdocs
     		if (is_object($xml->dolibarr_htdocs_dir[0]))
     		{
     			//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
-    			$includecustom=(empty($xml->dolibarr_htdocs_dir[0]['includecustom'])?0:$xml->dolibarr_htdocs_dir[0]['includecustom']);
+    			$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
 
     			// Defined qualified files (must be same than into generate_filelist_xml.php)
-    			$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-    			$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+    			$regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+    			$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
     			$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
 
     			// Fill file_list with files in signature, new files, modified files
-    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat);		// Fill array $file_list
+    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
     			// Complete with list of new files
     			foreach ($scanfiles as $keyfile => $valfile)
     			{
-    				$tmprelativefilename=preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
-    				if (! in_array($tmprelativefilename, $file_list['insignature']))
+    				$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
+    				if (!in_array($tmprelativefilename, $file_list['insignature']))
     				{
-    					$md5newfile=@md5_file($valfile['fullname']);    // Can fails if we don't have permission to open/read file
-    					$file_list['added'][]=array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+    					$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
+    					$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
     				}
     			}
 
     			// Files missings
-    			$out.=load_fiche_titre($langs->trans("FilesMissing"));
+    			$out .= load_fiche_titre($langs->trans("FilesMissing"));
 
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Filename") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-    			$out.='</tr>'."\n";
+    			$out .= '<div class="div-table-responsive-no-min">';
+    			$out .= '<table class="noborder">';
+    			$out .= '<tr class="liste_titre">';
+    			$out .= '<td>#</td>';
+    			$out .= '<td>'.$langs->trans("Filename").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("ExpectedChecksum").'</td>';
+    			$out .= '</tr>'."\n";
     			$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
     			if (is_array($tmpfilelist) && count($tmpfilelist))
     			{
@@ -1493,36 +1493,36 @@ class Setup extends DolibarrApi
     				foreach ($tmpfilelist as $file)
     				{
     					$i++;
-    					$out.='<tr class="oddeven">';
-    					$out.='<td>'.$i.'</td>' . "\n";
-    					$out.='<td>'.$file['filename'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-    					$out.="</tr>\n";
+    					$out .= '<tr class="oddeven">';
+    					$out .= '<td>'.$i.'</td>'."\n";
+    					$out .= '<td>'.$file['filename'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['expectedmd5'].'</td>'."\n";
+    					$out .= "</tr>\n";
     				}
     			}
     			else
     			{
-    				$out.='<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+    				$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
-    			$out.='</table>';
-    			$out.='</div>';
+    			$out .= '</table>';
+    			$out .= '</div>';
 
-    			$out.='<br>';
+    			$out .= '<br>';
 
     			// Files modified
-    			$out.=load_fiche_titre($langs->trans("FilesModified"));
+    			$out .= load_fiche_titre($langs->trans("FilesModified"));
 
-    			$totalsize=0;
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Filename") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
-    			$out.='<td class="right">' . $langs->trans("Size") . '</td>';
-    			$out.='<td class="right">' . $langs->trans("DateModification") . '</td>';
-    			$out.='</tr>'."\n";
+    			$totalsize = 0;
+    			$out .= '<div class="div-table-responsive-no-min">';
+    			$out .= '<table class="noborder">';
+    			$out .= '<tr class="liste_titre">';
+    			$out .= '<td>#</td>';
+    			$out .= '<td>'.$langs->trans("Filename").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("ExpectedChecksum").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("CurrentChecksum").'</td>';
+    			$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+    			$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+    			$out .= '</tr>'."\n";
     			$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
     			if (is_array($tmpfilelist2) && count($tmpfilelist2))
     			{
@@ -1530,49 +1530,49 @@ class Setup extends DolibarrApi
     				foreach ($tmpfilelist2 as $file)
     				{
     					$i++;
-    					$out.='<tr class="oddeven">';
-    					$out.='<td>'.$i.'</td>' . "\n";
-    					$out.='<td>'.$file['filename'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['md5'].'</td>' . "\n";
+    					$out .= '<tr class="oddeven">';
+    					$out .= '<td>'.$i.'</td>'."\n";
+    					$out .= '<td>'.$file['filename'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['expectedmd5'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['md5'].'</td>'."\n";
     					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
     					$totalsize += $size;
-    					$out.='<td class="right">'.dol_print_size($size).'</td>' . "\n";
-    					$out.='<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>' . "\n";
-    					$out.="</tr>\n";
+    					$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+    					$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+    					$out .= "</tr>\n";
     				}
-    				$out.='<tr class="liste_total">';
-    				$out.='<td></td>' . "\n";
-    				$out.='<td>'.$langs->trans("Total").'</td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td class="right">'.dol_print_size($totalsize).'</td>' . "\n";
-    				$out.='<td class="right"></td>' . "\n";
-    				$out.="</tr>\n";
+    				$out .= '<tr class="liste_total">';
+    				$out .= '<td></td>'."\n";
+    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+    				$out .= '<td align="center"></td>'."\n";
+    				$out .= '<td align="center"></td>'."\n";
+    				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+    				$out .= '<td class="right"></td>'."\n";
+    				$out .= "</tr>\n";
     			}
     			else
     			{
-    				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
-    			$out.='</table>';
-    			$out.='</div>';
+    			$out .= '</table>';
+    			$out .= '</div>';
 
-    			$out.='<br>';
+    			$out .= '<br>';
 
     			// Files added
-    			$out.=load_fiche_titre($langs->trans("FilesAdded"));
+    			$out .= load_fiche_titre($langs->trans("FilesAdded"));
 
     			$totalsize = 0;
-    			$out.='<div class="div-table-responsive-no-min">';
-    			$out.='<table class="noborder">';
-    			$out.='<tr class="liste_titre">';
-    			$out.='<td>#</td>';
-    			$out.='<td>' . $langs->trans("Filename") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("ExpectedChecksum") . '</td>';
-    			$out.='<td align="center">' . $langs->trans("CurrentChecksum") . '</td>';
-    			$out.='<td class="right">' . $langs->trans("Size") . '</td>';
-    			$out.='<td class="right">' . $langs->trans("DateModification") . '</td>';
-    			$out.='</tr>'."\n";
+    			$out .= '<div class="div-table-responsive-no-min">';
+    			$out .= '<table class="noborder">';
+    			$out .= '<tr class="liste_titre">';
+    			$out .= '<td>#</td>';
+    			$out .= '<td>'.$langs->trans("Filename").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("ExpectedChecksum").'</td>';
+    			$out .= '<td align="center">'.$langs->trans("CurrentChecksum").'</td>';
+    			$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+    			$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+    			$out .= '</tr>'."\n";
     			$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
     			if (is_array($tmpfilelist3) && count($tmpfilelist3))
     			{
@@ -1580,32 +1580,32 @@ class Setup extends DolibarrApi
     				foreach ($tmpfilelist3 as $file)
     				{
     					$i++;
-    					$out.='<tr class="oddeven">';
-    					$out.='<td>'.$i.'</td>' . "\n";
-    					$out.='<td>'.$file['filename'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['expectedmd5'].'</td>' . "\n";
-    					$out.='<td align="center">'.$file['md5'].'</td>' . "\n";
+    					$out .= '<tr class="oddeven">';
+    					$out .= '<td>'.$i.'</td>'."\n";
+    					$out .= '<td>'.$file['filename'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['expectedmd5'].'</td>'."\n";
+    					$out .= '<td align="center">'.$file['md5'].'</td>'."\n";
     					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
     					$totalsize += $size;
-    					$out.='<td class="right">'.dol_print_size($size).'</td>' . "\n";
-    					$out.='<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>' . "\n";
-    					$out.="</tr>\n";
+    					$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+    					$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+    					$out .= "</tr>\n";
     				}
-    				$out.='<tr class="liste_total">';
-    				$out.='<td></td>' . "\n";
-    				$out.='<td>'.$langs->trans("Total").'</td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td align="center"></td>' . "\n";
-    				$out.='<td class="right">'.dol_print_size($totalsize).'</td>' . "\n";
-    				$out.='<td class="right"></td>' . "\n";
-    				$out.="</tr>\n";
+    				$out .= '<tr class="liste_total">';
+    				$out .= '<td></td>'."\n";
+    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+    				$out .= '<td align="center"></td>'."\n";
+    				$out .= '<td align="center"></td>'."\n";
+    				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+    				$out .= '<td class="right"></td>'."\n";
+    				$out .= "</tr>\n";
     			}
     			else
     			{
-    				$out.='<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     			}
-    			$out.='</table>';
-    			$out.='</div>';
+    			$out .= '</table>';
+    			$out .= '</div>';
 
 
     			// Show warning
@@ -1638,24 +1638,24 @@ class Setup extends DolibarrApi
     			if (count($file_list['added']))
     			{
     				$resultcode = 'warning';
-    				$resultcomment='FileIntegrityIsOkButFilesWereAdded';
+    				$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
     				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    				$outcurrentchecksum =  $checksumget;
+    				$outcurrentchecksum = $checksumget;
     			}
     			else
     			{
     				$resultcode = 'ok';
-    				$resultcomment='Success';
+    				$resultcomment = 'Success';
     				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    				$outcurrentchecksum =  $checksumget;
+    				$outcurrentchecksum = $checksumget;
     			}
     		}
     		else
     		{
     			$resultcode = 'error';
-    			$resultcomment='Error';
+    			$resultcomment = 'Error';
     			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    			$outcurrentchecksum =  $checksumget;
+    			$outcurrentchecksum = $checksumget;
     		}
     	}
     	else {
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 6f79f7640df..f2c78827b2d 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -35,7 +35,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || ! is_object($object))
+if (empty($object) || !is_object($object))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -44,11 +44,11 @@ if (empty($object) || ! is_object($object))
 
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
 
-if (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
-if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
+if (empty($dateSelector)) $dateSelector = 0;
+if (empty($forceall)) $forceall = 0;
+if (empty($senderissupplier)) $senderissupplier = 0;
+if (empty($inputalsopricewithtax)) $inputalsopricewithtax = 0;
+if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax = 0;
 
 // add html5 elements
 $domData  = ' data-element="'.$line->element.'"';
@@ -59,11 +59,11 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
 // Lines for extrafield
 $objectline = new BOMLine($object->db);
 
-$coldisplay=0;
+$coldisplay = 0;
 print "<!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->\n";
 print '<tr id="row-'.$line->id.'" class="drag drop oddeven" '.$domData.' >';
-if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-	print '<td class="linecolnum center">'.($i+1).'</td>';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	print '<td class="linecolnum center">'.($i + 1).'</td>';
 	$coldisplay++;
 }
 print '<td class="linecoldescription minwidth300imp">';
@@ -75,10 +75,10 @@ print $tmpproduct->getNomUrl(1);
 print '</td>';
 print '<td class="linecolqty nowrap right">';
 $coldisplay++;
-echo price($line->qty, 0, '', 0, 0);  // Yes, it is a quantity, not a price, but we just want the formating role of function price
+echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
 print '</td>';
 
-if($conf->global->PRODUCT_USE_UNITS)
+if ($conf->global->PRODUCT_USE_UNITS)
 {
 	print '<td class="linecoluseunit nowrap left">';
 	$label = $line->getLabelOfUnit('short');
@@ -113,9 +113,9 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines' )
 
     print '<td class="linecoldelete center">';
     $coldisplay++;
-    if (($line->fk_prev_id == null ) && empty($disableremove)) {
+    if (($line->fk_prev_id == null) && empty($disableremove)) {
         //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
-        print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $this->id . '&amp;action=deleteline&amp;lineid=' . $line->id . '">';
+        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;lineid='.$line->id.'">';
         print img_delete();
         print '</a>';
     }
@@ -129,24 +129,24 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines' )
 			echo img_up('default', 0, 'imgupforline');
 			print '</a>';
 		}
-		if ($i < $num-1) {
+		if ($i < $num - 1) {
 			print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">';
 			echo img_down('default', 0, 'imgdownforline');
 			print '</a>';
 		}
 		print '</td>';
 	} else {
-		print '<td '.(($conf->browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown center"':' class="linecolmove center"').'></td>';
+		print '<td '.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'></td>';
 		$coldisplay++;
 	}
 } else {
     print '<td colspan="3"></td>';
-    $coldisplay=$coldisplay+3;
+    $coldisplay = $coldisplay + 3;
 }
 
 if ($action == 'selectlines') {
     print '<td class="linecolcheck center">';
-    print '<input type="checkbox" class="linecheckbox" name="line_checkbox['.($i+1).']" value="'.$line->id.'" >';
+    print '<input type="checkbox" class="linecheckbox" name="line_checkbox['.($i + 1).']" value="'.$line->id.'" >';
     print '</td>';
 }
 
@@ -155,7 +155,7 @@ print '</tr>';
 //Line extrafield
 if (!empty($extrafields))
 {
-	print $line->showOptionals($extrafields, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
+	print $line->showOptionals($extrafields, 'view', array('style'=>'class="drag drop oddeven"', 'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD) ? 0 : 1);
 }
 
 print "<!-- END PHP TEMPLATE objectline_view.tpl.php -->\n";
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 0934d85b3e7..e117f99488a 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -40,15 +40,15 @@ class Ccountry // extends CommonObject
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
 	 */
 	public $errors = array();
 
-	public $element='ccountry';			//!< Id that identify managed objects
-	public $table_element='c_country';	//!< Name of table without prefix where object is stored
+	public $element = 'ccountry'; //!< Id that identify managed objects
+	public $table_element = 'c_country'; //!< Name of table without prefix where object is stored
 
     /**
 	 * @var int ID
@@ -65,7 +65,7 @@ class Ccountry // extends CommonObject
 
 	public $active;
 
-	public $fields=array(
+	public $fields = array(
 		'label' => array('type'=>'varchar(250)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>15, 'notnull'=>-1, 'showoncombobox'=>'1')
 	);
 
@@ -91,43 +91,43 @@ class Ccountry // extends CommonObject
     public function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
-		$sql.= "rowid,";
-		$sql.= "code,";
-		$sql.= "code_iso,";
-		$sql.= "label,";
-		$sql.= "active";
-        $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
-		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+		$sql .= "rowid,";
+		$sql .= "code,";
+		$sql .= "code_iso,";
+		$sql .= "label,";
+		$sql .= "active";
+        $sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->code_iso) ? 'NULL' : "'".$this->db->escape($this->code_iso)."'").",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -144,13 +144,13 @@ class Ccountry // extends CommonObject
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -205,7 +205,7 @@ class Ccountry // extends CommonObject
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -221,13 +221,13 @@ class Ccountry // extends CommonObject
     public function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 
 		// Check parameters
@@ -235,21 +235,21 @@ class Ccountry // extends CommonObject
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").",";
-		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " code_iso=".(isset($this->code_iso) ? "'".$this->db->escape($this->code_iso)."'" : "null").",";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -266,13 +266,13 @@ class Ccountry // extends CommonObject
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -292,20 +292,20 @@ class Ccountry // extends CommonObject
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -322,13 +322,13 @@ class Ccountry // extends CommonObject
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 140d41c9a62..8aa24819efd 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -60,7 +60,7 @@ abstract class CommonObject
 	/**
 	 * @var string[]	Array of error strings
 	 */
-	public $errors=array();
+	public $errors = array();
 
 	/**
 	 * @var string ID to identify managed object
@@ -75,7 +75,7 @@ abstract class CommonObject
 	/**
 	 * @var int    Name of subtable line
 	 */
-	public $table_element_line='';
+	public $table_element_line = '';
 
 	/**
 	 * @var string		Key value used to track if data is coming from import wizard
@@ -85,7 +85,7 @@ abstract class CommonObject
 	/**
 	 * @var mixed		Contains data to manage extrafields
 	 */
-	public $array_options=array();
+	public $array_options = array();
 
 	/**
 	 * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked
@@ -114,7 +114,7 @@ abstract class CommonObject
 	/**
 	 * @var array<string,mixed>		Can be used to pass information when only object is provided to method
 	 */
-	public $context=array();
+	public $context = array();
 
 	/**
 	 * @var string		Contains canvas name if record is an alternative canvas record
@@ -380,7 +380,7 @@ abstract class CommonObject
 	 * @var mixed		Contains comments
 	 * @see fetchComments()
 	 */
-	public $comments=array();
+	public $comments = array();
 
 	/**
 	 * @var int
@@ -454,27 +454,27 @@ abstract class CommonObject
 	 */
 	public static function isExistingObject($element, $id, $ref = '', $ref_ext = '')
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		$sql = "SELECT rowid, ref, ref_ext";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$element;
-		$sql.= " WHERE entity IN (".getEntity($element).")" ;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$element;
+		$sql .= " WHERE entity IN (".getEntity($element).")";
 
-		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
-		elseif ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";
-		elseif ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		if ($id > 0) $sql .= " AND rowid = ".$db->escape($id);
+		elseif ($ref) $sql .= " AND ref = '".$db->escape($ref)."'";
+		elseif ($ref_ext) $sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
 		else {
-			$error='ErrorWrongParameters';
+			$error = 'ErrorWrongParameters';
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) $sql.= " AND entity = ".$conf->entity;
+		if ($ref || $ref_ext) $sql .= " AND entity = ".$conf->entity;
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$num=$db->num_rows($resql);
+			$num = $db->num_rows($resql);
 			if ($num > 0) return 1;
 			else return 0;
 		}
@@ -488,7 +488,7 @@ abstract class CommonObject
 	 */
 	public function errorsToString()
 	{
-		return $this->error.(is_array($this->errors)?(($this->error!=''?', ':'').join(', ', $this->errors)):'');
+		return $this->error.(is_array($this->errors) ? (($this->error != '' ? ', ' : '').join(', ', $this->errors)) : '');
 	}
 
 	/**
@@ -501,14 +501,14 @@ abstract class CommonObject
 	{
 	    global $hookmanager;
 
-	    $parameters=array('objref'=>$objref);
-	    $action='';
+	    $parameters = array('objref'=>$objref);
+	    $action = '';
 	    $reshook = $hookmanager->executeHooks('getFormatedCustomerRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 	    if ($reshook > 0)
 	    {
 	        return $hookmanager->resArray['objref'];
 	    }
-	    return $objref.(isset($hookmanager->resArray['objref'])?$hookmanager->resArray['objref']:'');
+	    return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
 	}
 
 	/**
@@ -521,14 +521,14 @@ abstract class CommonObject
 	{
 	    global $hookmanager;
 
-	    $parameters=array('objref'=>$objref);
-	    $action='';
+	    $parameters = array('objref'=>$objref);
+	    $action = '';
 	    $reshook = $hookmanager->executeHooks('getFormatedSupplierRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 	    if ($reshook > 0)
 	    {
 	        return $hookmanager->resArray['objref'];
 	    }
-	    return $objref.(isset($hookmanager->resArray['objref'])?$hookmanager->resArray['objref']:'');
+	    return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
 	}
 
 	/**
@@ -543,18 +543,18 @@ abstract class CommonObject
 	public function getFullName($langs, $option = 0, $nameorder = -1, $maxlen = 0)
 	{
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
-		$lastname=$this->lastname;
-		$firstname=$this->firstname;
-		if (empty($lastname))  $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:'')))));
+		$lastname = $this->lastname;
+		$firstname = $this->firstname;
+		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
 
-		$ret='';
+		$ret = '';
 		if ($option && $this->civility_id)
 		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
-			else $ret.=$this->civility_id.' ';
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id) != "Civility".$this->civility_id) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
+			else $ret .= $this->civility_id.' ';
 		}
 
-		$ret.=dolGetFirstLastname($firstname, $lastname, $nameorder);
+		$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
 
 		return dol_trunc($ret, $maxlen);
 	}
@@ -571,20 +571,20 @@ abstract class CommonObject
 	{
 		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
 		{
-			require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
-			$tmparray=getCountry($this->country_id, 'all');
-			$this->country_code=$tmparray['code'];
-			$this->country     =$tmparray['label'];
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+			$tmparray = getCountry($this->country_id, 'all');
+			$this->country_code = $tmparray['code'];
+			$this->country     = $tmparray['label'];
 		}
 
         if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))
     	{
-    		require_once DOL_DOCUMENT_ROOT .'/core/lib/company.lib.php';
-    		$tmparray=getState($this->state_id, 'all', 0, 1);
-			$this->state_code   =$tmparray['code'];
-			$this->state        =$tmparray['label'];
-			$this->region_code  =$tmparray['region_code'];
-			$this->region       =$tmparray['region'];
+    		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+    		$tmparray = getState($this->state_id, 'all', 0, 1);
+			$this->state_code   = $tmparray['code'];
+			$this->state        = $tmparray['label'];
+			$this->region_code  = $tmparray['region_code'];
+			$this->region       = $tmparray['region'];
         }
 
 		return dol_format_address($this, $withcountry, $sep);
@@ -737,11 +737,11 @@ abstract class CommonObject
 
 		if (empty($this->last_main_doc))
 		{
-			return '';		// No way to known which document name to use
+			return ''; // No way to known which document name to use
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($this->db);
+		$ecmfile = new EcmFiles($this->db);
 		$result = $ecmfile->fetch(0, '', $this->last_main_doc);
 		if ($result < 0)
 		{
@@ -788,29 +788,29 @@ abstract class CommonObject
 			else return '';
 		}
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 		// This is to use external domain name found into config file
 		//if (DOL_URL_ROOT && ! preg_match('/\/$/', $urlwithouturlroot) && ! preg_match('/^\//', DOL_URL_ROOT)) $urlwithroot=$urlwithouturlroot.'/'.DOL_URL_ROOT;
 		//else
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-		$forcedownload=0;
+		$forcedownload = 0;
 
-		$paramlink='';
+		$paramlink = '';
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share;			// Hash for public share
-		if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1';
+		if (!empty($ecmfile->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share
+		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
 
 		if ($relativelink)
 		{
-			$linktoreturn='document.php'.($paramlink?'?'.$paramlink:'');
+			$linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 		else
 		{
-			$linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
+			$linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 
 		// Here $ecmfile->share is defined
@@ -831,7 +831,7 @@ abstract class CommonObject
 	public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
 	{
         // phpcs:enable
-		global $user,$langs;
+		global $user, $langs;
 
 
 		dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");
@@ -840,43 +840,43 @@ abstract class CommonObject
 		if ($fk_socpeople <= 0)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorWrongValueForParameterX", "1");
+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "1");
 			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
 			return -1;
 		}
-		if (! $type_contact)
+		if (!$type_contact)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorWrongValueForParameterX", "2");
+			$this->error = $langs->trans("ErrorWrongValueForParameterX", "2");
 			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
 			return -2;
 		}
 
-		$id_type_contact=0;
+		$id_type_contact = 0;
 		if (is_numeric($type_contact))
 		{
-			$id_type_contact=$type_contact;
+			$id_type_contact = $type_contact;
 		}
 		else
 		{
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-			$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-			$sql.= " AND tc.source='".$this->db->escape($source)."'";
-			$sql.= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+			$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
+			$sql .= " AND tc.source='".$this->db->escape($source)."'";
+			$sql .= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
 			//print $sql;
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact=$obj->rowid;
+				if ($obj) $id_type_contact = $obj->rowid;
 			}
 		}
 
 		if ($id_type_contact == 0)
 		{
-			$this->error='CODE_NOT_VALID_FOR_THIS_ELEMENT';
+			$this->error = 'CODE_NOT_VALID_FOR_THIS_ELEMENT';
 			dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");
 			return -3;
 		}
@@ -884,34 +884,34 @@ abstract class CommonObject
 		$datecreate = dol_now();
 
 		// Socpeople must have already been added by some trigger, then we have to check it to avoid DB_ERROR_RECORD_ALREADY_EXISTS error
-		$TListeContacts=$this->liste_contact(-1, $source);
-		$already_added=false;
-		if (is_array($TListeContacts) && ! empty($TListeContacts)) {
-			foreach($TListeContacts as $array_contact) {
+		$TListeContacts = $this->liste_contact(-1, $source);
+		$already_added = false;
+		if (is_array($TListeContacts) && !empty($TListeContacts)) {
+			foreach ($TListeContacts as $array_contact) {
 				if ($array_contact['status'] == 4 && $array_contact['id'] == $fk_socpeople && $array_contact['fk_c_type_contact'] == $id_type_contact) {
-					$already_added=true;
+					$already_added = true;
 					break;
 				}
 			}
 		}
 
-		if(!$already_added) {
+		if (!$already_added) {
 			$this->db->begin();
 
 			// Insert into database
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_contact";
-			$sql.= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
-			$sql.= " VALUES (".$this->id.", ".$fk_socpeople." , " ;
-			$sql.= "'".$this->db->idate($datecreate)."'";
-			$sql.= ", 4, ". $id_type_contact;
-			$sql.= ")";
+			$sql .= " (element_id, fk_socpeople, datecreate, statut, fk_c_type_contact) ";
+			$sql .= " VALUES (".$this->id.", ".$fk_socpeople." , ";
+			$sql .= "'".$this->db->idate($datecreate)."'";
+			$sql .= ", 4, ".$id_type_contact;
+			$sql .= ")";
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				if (! $notrigger)
+				if (!$notrigger)
 				{
-					$result=$this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
+					$result = $this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
 					if ($result < 0)
 					{
 						$this->db->rollback();
@@ -926,14 +926,14 @@ abstract class CommonObject
 			{
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
-					$this->error=$this->db->errno();
+					$this->error = $this->db->errno();
 					$this->db->rollback();
 					echo 'err rollback';
 					return -2;
 				}
 				else
 				{
-					$this->error=$this->db->error();
+					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
@@ -953,11 +953,11 @@ abstract class CommonObject
 	{
         // phpcs:enable
 		$contacts = $objFrom->liste_contact(-1, $source);
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
 			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
@@ -979,18 +979,18 @@ abstract class CommonObject
         // phpcs:enable
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
-		$sql.= " statut = ".$statut;
-		if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'";
-		if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'";
-		$sql.= " where rowid = ".$rowid;
-		$resql=$this->db->query($sql);
+		$sql .= " statut = ".$statut;
+		if ($type_contact_id) $sql .= ", fk_c_type_contact = '".$type_contact_id."'";
+		if ($fk_socpeople) $sql .= ", fk_socpeople = '".$fk_socpeople."'";
+		$sql .= " where rowid = ".$rowid;
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return 0;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1012,14 +1012,14 @@ abstract class CommonObject
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql.= " WHERE rowid =".$rowid;
+		$sql .= " WHERE rowid =".$rowid;
 
 		dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
-				$result=$this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
+				$result = $this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
 				if ($result < 0) { $this->db->rollback(); return -1; }
 			}
 
@@ -1028,7 +1028,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1048,16 +1048,16 @@ abstract class CommonObject
 		$temp = array();
 		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);
 
-		foreach($typeContact as $key => $value)
+		foreach ($typeContact as $key => $value)
 		{
 			array_push($temp, $key);
 		}
 		$listId = implode(",", $temp);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
-		$sql.= " WHERE element_id = ".$this->id;
+		$sql .= " WHERE element_id = ".$this->id;
 		if ($listId)
-			$sql.= " AND fk_c_type_contact IN (".$listId.")";
+			$sql .= " AND fk_c_type_contact IN (".$listId.")";
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -1066,7 +1066,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -1138,7 +1138,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1154,16 +1154,16 @@ abstract class CommonObject
 	public function swapContactStatus($rowid)
 	{
 		$sql = "SELECT ec.datecreate, ec.statut, ec.fk_socpeople, ec.fk_c_type_contact,";
-		$sql.= " tc.code, tc.libelle";
+		$sql .= " tc.code, tc.libelle";
 		//$sql.= ", s.fk_soc";
-		$sql.= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
+		$sql .= " FROM (".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as tc)";
 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as s ON ec.fk_socpeople=s.rowid";	// Si contact de type external, alors il est lie a une societe
-		$sql.= " WHERE ec.rowid =".$rowid;
-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
-		$sql.= " AND tc.element = '".$this->db->escape($this->element)."'";
+		$sql .= " WHERE ec.rowid =".$rowid;
+		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
+		$sql .= " AND tc.element = '".$this->db->escape($this->element)."'";
 
 		dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -1174,7 +1174,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1196,39 +1196,39 @@ abstract class CommonObject
         // phpcs:enable
 		global $langs;
 
-		if (empty($order)) $order='position';
-		if ($order == 'position') $order.=',code';
+		if (empty($order)) $order = 'position';
+		if ($order == 'position') $order .= ',code';
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql.= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types
-		if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'";
-		if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'";
-		$sql.= $this->db->order($order, 'ASC');
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
+		if ($activeonly == 1) $sql .= " AND tc.active=1"; // only the active types
+		if (!empty($source) && $source != 'all') $sql .= " AND tc.source='".$this->db->escape($source)."'";
+		if (!empty($code)) $sql .= " AND tc.code='".$this->db->escape($code)."'";
+		$sql .= $this->db->order($order, 'ASC');
 
 		//print "sql=".$sql;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$transkey="TypeContact_".$this->element."_".$source."_".$obj->code;
-				$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid]=$libelle_type;
-				else $tab[$obj->code]=$libelle_type;
+				$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;
+				$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
+				if (empty($option)) $tab[$obj->rowid] = $libelle_type;
+				else $tab[$obj->code] = $libelle_type;
 				$i++;
 			}
 			return $tab;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			//dol_print_error($this->db);
 			return null;
 		}
@@ -1253,51 +1253,51 @@ abstract class CommonObject
 		$tab = array();
 
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position, tc.element";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 
-		$sqlWhere=array();
+		$sqlWhere = array();
 		if (!empty($element))
-			$sqlWhere[]=" tc.element='".$this->db->escape($element)."'";
+			$sqlWhere[] = " tc.element='".$this->db->escape($element)."'";
 
 		if ($activeonly == 1)
-			$sqlWhere[]=" tc.active=1"; // only the active types
+			$sqlWhere[] = " tc.active=1"; // only the active types
 
-		if (! empty($source) && $source != 'all')
-			$sqlWhere[]=" tc.source='".$this->db->escape($source)."'";
+		if (!empty($source) && $source != 'all')
+			$sqlWhere[] = " tc.source='".$this->db->escape($source)."'";
 
-		if (! empty($code))
-			$sqlWhere[]=" tc.code='".$this->db->escape($code)."'";
+		if (!empty($code))
+			$sqlWhere[] = " tc.code='".$this->db->escape($code)."'";
 
-		if (count($sqlWhere)>0) {
-			$sql .= " WHERE ". implode(' AND ', $sqlWhere);
+		if (count($sqlWhere) > 0) {
+			$sql .= " WHERE ".implode(' AND ', $sqlWhere);
 		}
 
-		$sql.= $this->db->order('tc.element, tc.position', 'ASC');
+		$sql .= $this->db->order('tc.element, tc.position', 'ASC');
 
 		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) {
 				while ($obj = $this->db->fetch_object($resql)) {
-					if (strpos($obj->element, 'project')!==false) {
-						$element='projet';
-					} elseif($obj->element=='contrat') {
-						$element='contract';
-					} elseif(strpos($obj->element, 'supplier')!==false && $obj->element!='supplier_proposal') {
-						$element='fournisseur';
-					} elseif(strpos($obj->element, 'supplier')!==false && $obj->element!='supplier_proposal') {
-						$element='fournisseur';
+					if (strpos($obj->element, 'project') !== false) {
+						$element = 'projet';
+					} elseif ($obj->element == 'contrat') {
+						$element = 'contract';
+					} elseif (strpos($obj->element, 'supplier') !== false && $obj->element != 'supplier_proposal') {
+						$element = 'fournisseur';
+					} elseif (strpos($obj->element, 'supplier') !== false && $obj->element != 'supplier_proposal') {
+						$element = 'fournisseur';
 					} else {
-						$element=$obj->element;
+						$element = $obj->element;
 					}
 					if ($conf->{$element}->enabled) {
-						$libelle_element = $langs->trans('ContactDefault_' . $obj->element);
-						$transkey = "TypeContact_" . $this->element . "_" . $source . "_" . $obj->code;
+						$libelle_element = $langs->trans('ContactDefault_'.$obj->element);
+						$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;
 						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
 						if (empty($option))
-							$tab[$obj->rowid] = $libelle_element . ' - ' . $libelle_type;
-						else $tab[$obj->rowid] = $libelle_element . ' - ' . $libelle_type;
+							$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
+						else $tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
 					}
 				}
 			}
@@ -1305,7 +1305,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return null;
 		}
 	}
@@ -1325,49 +1325,49 @@ abstract class CommonObject
 	{
 		global $conf;
 
-		$result=array();
-		$i=0;
+		$result = array();
+		$i = 0;
 		//cas particulier pour les expeditions
-		if ($this->element=='shipping' && $this->origin_id != 0) {
-			$id=$this->origin_id;
-			$element='commande';
-		} elseif ($this->element=='reception' && $this->origin_id != 0) {
-			$id=$this->origin_id;
-			$element='order_supplier';
+		if ($this->element == 'shipping' && $this->origin_id != 0) {
+			$id = $this->origin_id;
+			$element = 'commande';
+		} elseif ($this->element == 'reception' && $this->origin_id != 0) {
+			$id = $this->origin_id;
+			$element = 'order_supplier';
 		} else {
-			$id=$this->id;
-			$element=$this->element;
+			$id = $this->id;
+			$element = $this->element;
 		}
 
 		$sql = "SELECT ec.fk_socpeople";
-		$sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,";
-		$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
-		$sql.= " WHERE ec.element_id = ".$id;
-		$sql.= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
-		$sql.= " AND ec.fk_c_type_contact = tc.rowid";
-		$sql.= " AND tc.element = '".$element."'";
-		$sql.= " AND tc.source = '".$source."'";
-		if ($code) $sql.= " AND tc.code = '".$code."'";
-		$sql.= " AND tc.active = 1";
-		if ($status) $sql.= " AND ec.statut = ".$status;
+		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
+		if ($source == 'internal') $sql .= " ".MAIN_DB_PREFIX."user as c,";
+		if ($source == 'external') $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+		$sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";
+		$sql .= " WHERE ec.element_id = ".$id;
+		$sql .= " AND ec.fk_socpeople = c.rowid";
+		if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";
+		if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";
+		$sql .= " AND ec.fk_c_type_contact = tc.rowid";
+		$sql .= " AND tc.element = '".$element."'";
+		$sql .= " AND tc.source = '".$source."'";
+		if ($code) $sql .= " AND tc.code = '".$code."'";
+		$sql .= " AND tc.active = 1";
+		if ($status) $sql .= " AND ec.statut = ".$status;
 
 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$result[$i]=$obj->fk_socpeople;
+				$result[$i] = $obj->fk_socpeople;
 				$i++;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return null;
 		}
 
@@ -1384,13 +1384,13 @@ abstract class CommonObject
 	public function fetch_contact($contactid = null)
 	{
         // phpcs:enable
-		if (empty($contactid)) $contactid=$this->contactid;
+		if (empty($contactid)) $contactid = $this->contactid;
 
 		if (empty($contactid)) return 0;
 
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
-		$result=$contact->fetch($contactid);
+		$result = $contact->fetch($contactid);
 		$this->contact = $contact;
 		return $result;
 	}
@@ -1410,7 +1410,7 @@ abstract class CommonObject
 		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
 			return 0;
 
-		require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
 		if ($force_thirdparty_id)
@@ -1473,7 +1473,7 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
-		$idtype=$this->barcode_type;
+		$idtype = $this->barcode_type;
 		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
 		{
 			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
@@ -1486,8 +1486,8 @@ abstract class CommonObject
 			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
 			{
 				$sql = "SELECT rowid, code, libelle as label, coder";
-				$sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-				$sql.= " WHERE rowid = ".$idtype;
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+				$sql .= " WHERE rowid = ".$idtype;
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
@@ -1520,13 +1520,13 @@ abstract class CommonObject
         // phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet;	// For backward compatibility
+		if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility
 		if (empty($this->fk_project)) return 0;
 
 		$project = new Project($this->db);
 		$result = $project->fetch($this->fk_project);
 
-		$this->projet = $project;	// deprecated
+		$this->projet = $project; // deprecated
 		$this->project = $project;
 		return $result;
 	}
@@ -1562,7 +1562,7 @@ abstract class CommonObject
 	{
         // phpcs:enable
 		$user = new User($this->db);
-		$result=$user->fetch($userid);
+		$result = $user->fetch($userid);
 		$this->user = $user;
 		return $result;
 	}
@@ -1600,14 +1600,14 @@ abstract class CommonObject
 	{
 		global $conf;
 
-		$result=false;
+		$result = false;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
-		$sql.= " WHERE ".$field." = '".$key."'";
-		if (! empty($element)) {
-			$sql.= " AND entity IN (".getEntity($element).")";
+		$sql .= " WHERE ".$field." = '".$key."'";
+		if (!empty($element)) {
+			$sql .= " AND entity IN (".getEntity($element).")";
 		} else {
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " AND entity = ".$conf->entity;
 		}
 
 		dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
@@ -1634,10 +1634,10 @@ abstract class CommonObject
 	 */
 	public function getValueFrom($table, $id, $field)
 	{
-		$result=false;
+		$result = false;
 		if (!empty($id) && !empty($field) && !empty($table)) {
 			$sql = "SELECT ".$field." FROM ".MAIN_DB_PREFIX.$table;
-			$sql.= " WHERE rowid = ".$id;
+			$sql .= " WHERE rowid = ".$id;
 
 			dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1668,34 +1668,34 @@ abstract class CommonObject
 	 */
 	public function setValueFrom($field, $value, $table = '', $id = null, $format = '', $id_field = '', $fuser = null, $trigkey = '', $fk_user_field = 'fk_user_modif')
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		if (empty($table)) 	  $table=$this->table_element;
-		if (empty($id))    	  $id=$this->id;
-		if (empty($format))   $format='text';
-		if (empty($id_field)) $id_field='rowid';
+		if (empty($table)) 	  $table = $this->table_element;
+		if (empty($id))    	  $id = $this->id;
+		if (empty($format))   $format = 'text';
+		if (empty($id_field)) $id_field = 'rowid';
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		// Special case
-		if ($table == 'product' && $field == 'note_private') $field='note';
+		if ($table == 'product' && $field == 'note_private') $field = 'note';
 		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-		if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'";
-		elseif ($format == 'int') $sql.= $field." = ".$this->db->escape($value);
-		elseif ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		if ($format == 'text') $sql .= $field." = '".$this->db->escape($value)."'";
+		elseif ($format == 'int') $sql .= $field." = ".$this->db->escape($value);
+		elseif ($format == 'date') $sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
 
 		if ($fk_user_field)
 		{
-			if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id;
+			if (!empty($fuser) && is_object($fuser)) $sql .= ", ".$fk_user_field." = ".$fuser->id;
+			elseif (empty($fuser) || $fuser != 'none') $sql .= ", ".$fk_user_field." = ".$user->id;
 		}
 
-		$sql.= " WHERE ".$id_field." = ".$id;
+		$sql .= " WHERE ".$id_field." = ".$id;
 
 		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1712,11 +1712,11 @@ abstract class CommonObject
 				{
 					$result = $this->fetchCommon($id);
 				}
-				if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user);   // This may set this->errors
+				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
 				if ($result < 0) $error++;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				if (property_exists($this, $field)) $this->$field = $value;
 				$this->db->commit();
@@ -1730,7 +1730,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1750,7 +1750,7 @@ abstract class CommonObject
         // phpcs:enable
 		global $conf, $user;
 
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
 			dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
 			return -1;
@@ -1767,45 +1767,45 @@ abstract class CommonObject
 		if ($this->element == 'societe') $alias = 'te';
 
 		$sql = "SELECT MAX(te.".$fieldid.")";
-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
-		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
+		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
-		$sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
-		if (! empty($filter))
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if (!empty($filter))
 		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
-			$sql.=$filter;
+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			$sql .= $filter;
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-					$sql.= " AND te.entity IS NOT NULL"; // Show all users
+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+					$sql .= " AND te.entity IS NOT NULL"; // Show all users
 				} else {
-					$sql.= " AND ug.fk_user = te.rowid";
-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";
+					$sql .= " AND ug.fk_user = te.rowid";
+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";
 				}
 			} else {
-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
 		$result = $this->db->query($sql);
-		if (! $result)
+		if (!$result)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 		$row = $this->db->fetch_row($result);
@@ -1813,46 +1813,46 @@ abstract class CommonObject
 
 
 		$sql = "SELECT MIN(te.".$fieldid.")";
-		$sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te";
-		if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-			$sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug";
+		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
+		if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s";	// If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid";	// If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
-		$sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'";  // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)';
-		if (! empty($filter))
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc";
+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		if (!empty($filter))
 		{
-			if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND ";   // For backward compatibility
-			$sql.=$filter;
+			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+			$sql .= $filter;
 		}
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to entity
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid';			// If we need to link to societe to limit select to socid
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity
+		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			if ($this->element == 'user' && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-				if (! empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-					$sql.= " AND te.entity IS NOT NULL"; // Show all users
+			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+					$sql .= " AND te.entity IS NOT NULL"; // Show all users
 				} else {
-					$sql.= " AND ug.fk_user = te.rowid";
-					$sql.= " AND ug.entity IN (".getEntity($this->element).")";
+					$sql .= " AND ug.fk_user = te.rowid";
+					$sql .= " AND ug.entity IN (".getEntity($this->element).")";
 				}
 			} else {
-				$sql.= ' AND te.entity IN ('.getEntity($this->element).')';
+				$sql .= ' AND te.entity IN ('.getEntity($this->element).')';
 			}
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
 		$result = $this->db->query($sql);
-		if (! $result)
+		if (!$result)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -2;
 		}
 		$row = $this->db->fetch_row($result);
@@ -1873,7 +1873,7 @@ abstract class CommonObject
 	{
 		$contactAlreadySelected = array();
 		$tab = $this->liste_contact(-1, $source);
-		$num=count($tab);
+		$num = count($tab);
 		$i = 0;
 		while ($i < $num)
 		{
@@ -1893,7 +1893,7 @@ abstract class CommonObject
 	 */
 	public function setProject($projectid)
 	{
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
 			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
@@ -1962,14 +1962,14 @@ abstract class CommonObject
 			else
 			{
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -2003,14 +2003,14 @@ abstract class CommonObject
 			else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -2043,12 +2043,12 @@ abstract class CommonObject
 					foreach ($this->lines as &$line)
 					{
 						// Amounts in company currency will be recalculated
-						if($mode == 1) {
+						if ($mode == 1) {
 							$line->subprice = 0;
 						}
 
 						// Amounts in foreign currency will be recalculated
-						if($mode == 2) {
+						if ($mode == 2) {
 							$line->multicurrency_subprice = 0;
 						}
 
@@ -2056,14 +2056,14 @@ abstract class CommonObject
 							case 'propal':
 								$this->updateline(
 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,
 									$line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
 								break;
 							case 'commande':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,
 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
 									$line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
@@ -2071,7 +2071,7 @@ abstract class CommonObject
 								break;
 							case 'facture':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
 									$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,
 									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
 									$line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice
@@ -2080,21 +2080,21 @@ abstract class CommonObject
 							case 'supplier_proposal':
 								$this->updateline(
 									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description?$line->description:$line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
+									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
 									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,
 									$line->ref_fourn, $line->multicurrency_subprice
 								);
 								break;
 							case 'order_supplier':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->qty, $line->remise_percent,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
 									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,
 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
 								break;
 							case 'invoice_supplier':
 								$this->updateline(
-									$line->id, ($line->description?$line->description:$line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,
+									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,
 									$line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,
 									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
 								);
@@ -2111,14 +2111,14 @@ abstract class CommonObject
 			else
 			{
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -2148,20 +2148,20 @@ abstract class CommonObject
 				$this->cond_reglement_id = $id;
 				// for supplier
 				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
-				$this->cond_reglement = $id;	// for compatibility
+				$this->cond_reglement = $id; // for compatibility
 				return 1;
 			}
 			else
 			{
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
 		else
 		{
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
-			$this->error='Status of the object is incompatible '.$this->statut;
+			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
 		}
 	}
@@ -2192,14 +2192,14 @@ abstract class CommonObject
 	        else
 	        {
 	            dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
-	            $this->error=$this->db->error();
+	            $this->error = $this->db->error();
 	            return -1;
 	        }
 	    }
 	    else
 	    {
 	        dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');
-	        $this->error='Status of the object is incompatible '.$this->statut;
+	        $this->error = 'Status of the object is incompatible '.$this->statut;
 	        return -2;
 	    }
 	}
@@ -2217,7 +2217,7 @@ abstract class CommonObject
 		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
-		$sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
 		if ($this->db->query($sql))
 		{
@@ -2226,7 +2226,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
 			return -1;
 		}
@@ -2246,25 +2246,25 @@ abstract class CommonObject
 	{
 		global $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
 		$error = 0;
 
-		if (! $this->table_element) {
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setShippingMethod was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		$this->db->begin();
 
-		if ($shipping_method_id<0) $shipping_method_id='NULL';
+		if ($shipping_method_id < 0) $shipping_method_id = 'NULL';
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_shipping_method = ".$shipping_method_id;
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " SET fk_shipping_method = ".$shipping_method_id;
+		$sql .= " WHERE rowid=".$this->id;
 		$resql = $this->db->query($sql);
-		if (! $resql) {
+		if (!$resql) {
 			dol_syslog(get_class($this).'::setShippingMethod Error ', LOG_DEBUG);
 			$this->error = $this->db->lasterror();
 			$error++;
@@ -2272,8 +2272,8 @@ abstract class CommonObject
 			if (!$notrigger)
 			{
 				// Call trigger
-				$this->context=array('shippingmethodupdate'=>1);
-				$result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+				$this->context = array('shippingmethodupdate'=>1);
+				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
@@ -2283,7 +2283,7 @@ abstract class CommonObject
 			$this->db->rollback();
 			return -1;
 		} else {
-			$this->shipping_method_id = ($shipping_method_id=='NULL')?null:$shipping_method_id;
+			$this->shipping_method_id = ($shipping_method_id == 'NULL') ?null:$shipping_method_id;
 			$this->db->commit();
 			return 1;
 		}
@@ -2298,23 +2298,23 @@ abstract class CommonObject
 	 */
 	public function setWarehouse($warehouse_id)
 	{
-		if (! $this->table_element) {
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if ($warehouse_id<0) $warehouse_id='NULL';
+		if ($warehouse_id < 0) $warehouse_id = 'NULL';
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_warehouse = ".$warehouse_id;
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " SET fk_warehouse = ".$warehouse_id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		if ($this->db->query($sql)) {
-			$this->warehouse_id = ($warehouse_id=='NULL')?null:$warehouse_id;
+			$this->warehouse_id = ($warehouse_id == 'NULL') ?null:$warehouse_id;
 			return 1;
 		} else {
 			dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return 0;
 		}
 	}
@@ -2329,25 +2329,25 @@ abstract class CommonObject
 	 */
 	public function setDocModel($user, $modelpdf)
 	{
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
 			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
-		$newmodelpdf=dol_trunc($modelpdf, 255);
+		$newmodelpdf = dol_trunc($modelpdf, 255);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET model_pdf = '".$this->db->escape($newmodelpdf)."'";
+		$sql .= " WHERE rowid = ".$this->id;
 		// if ($this->element == 'facture') $sql.= " AND fk_statut < 2";
 		// if ($this->element == 'propal')  $sql.= " AND fk_statut = 0";
 
 		dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->modelpdf=$modelpdf;
+			$this->modelpdf = $modelpdf;
 			return 1;
 		}
 		else
@@ -2370,25 +2370,25 @@ abstract class CommonObject
 	{
 		global $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
 		$error = 0;
 
-		if (! $this->table_element) {
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 		$this->db->begin();
 
-		if ($fk_account<0) $fk_account='NULL';
+		if ($fk_account < 0) $fk_account = 'NULL';
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET fk_account = ".$fk_account;
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " SET fk_account = ".$fk_account;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
 			dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
 			$this->error = $this->db->lasterror();
@@ -2399,8 +2399,8 @@ abstract class CommonObject
 			if (!$notrigger)
 			{
 				// Call trigger
-				$this->context=array('bankaccountupdate'=>1);
-				$result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused);
+				$this->context = array('bankaccountupdate'=>1);
+				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
@@ -2412,7 +2412,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->fk_account = ($fk_account=='NULL')?null:$fk_account;
+			$this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;
 			$this->db->commit();
 			return 1;
 		}
@@ -2434,23 +2434,23 @@ abstract class CommonObject
 	public function line_order($renum = false, $rowidorder = 'ASC', $fk_parent_line = true)
 	{
         // phpcs:enable
-		if (! $this->table_element_line)
+		if (!$this->table_element_line)
 		{
 			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined", LOG_ERR);
 			return -1;
 		}
-		if (! $this->fk_element)
+		if (!$this->fk_element)
 		{
 			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		// Count number of lines to reorder (according to choice $renum)
-		$nl=0;
+		$nl = 0;
 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (! $renum) $sql.= ' AND rang = 0';
-		if ($renum) $sql.= ' AND rang <> 0';
+		$sql .= ' WHERE '.$this->fk_element.'='.$this->id;
+		if (!$renum) $sql .= ' AND rang = 0';
+		if ($renum) $sql .= ' AND rang <> 0';
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2464,28 +2464,28 @@ abstract class CommonObject
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
 			// counter that parents.
-			$rows=array();
+			$rows = array();
 
 			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL';
-			$sql.= ' ORDER BY rang ASC, rowid '.$rowidorder;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';
+			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$i=0;
+				$i = 0;
 				$num = $this->db->num_rows($resql);
 				while ($i < $num)
 				{
 					$row = $this->db->fetch_row($resql);
-					$rows[] = $row[0];	// Add parent line into array rows
+					$rows[] = $row[0]; // Add parent line into array rows
 					$childrens = $this->getChildrenOfLine($row[0]);
-					if (! empty($childrens))
+					if (!empty($childrens))
 					{
-						foreach($childrens as $child)
+						foreach ($childrens as $child)
 						{
 							array_push($rows, $child);
 						}
@@ -2494,11 +2494,11 @@ abstract class CommonObject
 				}
 
 				// Now we set a new number for each lines (parent and children with children included into parent tree)
-				if (! empty($rows))
+				if (!empty($rows))
 				{
-					foreach($rows as $key => $row)
+					foreach ($rows as $key => $row)
 					{
-						$this->updateRangOfLine($row, ($key+1));
+						$this->updateRangOfLine($row, ($key + 1));
 					}
 				}
 			}
@@ -2518,18 +2518,18 @@ abstract class CommonObject
 	 */
 	public function getChildrenOfLine($id)
 	{
-		$rows=array();
+		$rows = array();
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql.= ' AND fk_parent_line = '.$id;
-		$sql.= ' ORDER BY rang ASC';
+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= ' AND fk_parent_line = '.$id;
+		$sql .= ' ORDER BY rang ASC';
 
 		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$i=0;
+			$i = 0;
 			$num = $this->db->num_rows($resql);
 			while ($i < $num)
 			{
@@ -2594,14 +2594,14 @@ abstract class CommonObject
 	 */
 	public function updateRangOfLine($rowid, $rang)
 	{
-		$fieldposition = 'rang';	// @TODO Rename 'rang' into 'position'
+		$fieldposition = 'rang'; // @TODO Rename 'rang' into 'position'
 		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
-		$sql.= ' WHERE rowid = '.$rowid;
+		$sql .= ' WHERE rowid = '.$rowid;
 
 		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
-		if (! $this->db->query($sql))
+		if (!$this->db->query($sql))
 		{
 			dol_print_error($this->db);
 		}
@@ -2618,9 +2618,9 @@ abstract class CommonObject
 	{
         // phpcs:enable
 		$num = count($rows);
-		for ($i = 0 ; $i < $num ; $i++)
+		for ($i = 0; $i < $num; $i++)
 		{
-			$this->updateRangOfLine($rows[$i], ($i+1));
+			$this->updateRangOfLine($rows[$i], ($i + 1));
 		}
 	}
 
@@ -2638,14 +2638,14 @@ abstract class CommonObject
 			$fieldposition = 'rang';
 			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
-			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND rang = '.($rang - 1);
-			if ($this->db->query($sql) )
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' AND rang = '.($rang - 1);
+			if ($this->db->query($sql))
 			{
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);
-				$sql.= ' WHERE rowid = '.$rowid;
-				if (! $this->db->query($sql) )
+				$sql .= ' WHERE rowid = '.$rowid;
+				if (!$this->db->query($sql))
 				{
 					dol_print_error($this->db);
 				}
@@ -2673,13 +2673,13 @@ abstract class CommonObject
 			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND rang = '.($rang+1);
-			if ($this->db->query($sql) )
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' AND rang = '.($rang + 1);
+			if ($this->db->query($sql))
 			{
-				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang+1);
-				$sql.= ' WHERE rowid = '.$rowid;
-				if (! $this->db->query($sql) )
+				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang + 1);
+				$sql .= ' WHERE rowid = '.$rowid;
+				if (!$this->db->query($sql))
 				{
 					dol_print_error($this->db);
 				}
@@ -2700,7 +2700,7 @@ abstract class CommonObject
 	public function getRangOfLine($rowid)
 	{
 		$sql = 'SELECT rang FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE rowid ='.$rowid;
+		$sql .= ' WHERE rowid ='.$rowid;
 
 		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2720,8 +2720,8 @@ abstract class CommonObject
 	public function getIdOfLine($rang)
 	{
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-		$sql.= ' AND rang = '.$rang;
+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= ' AND rang = '.$rang;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2744,15 +2744,15 @@ abstract class CommonObject
 		if ($fk_parent_line)
 		{
 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
-			$sql.= ' AND fk_parent_line = '.$fk_parent_line;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' AND fk_parent_line = '.$fk_parent_line;
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$row = $this->db->fetch_row($resql);
-				if (! empty($row[0]))
+				if (!empty($row[0]))
 				{
 					return $row[0];
 				}
@@ -2766,7 +2766,7 @@ abstract class CommonObject
 		else
 		{
 			$sql = 'SELECT max(rang) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2788,15 +2788,15 @@ abstract class CommonObject
 	public function update_ref_ext($ref_ext)
 	{
         // phpcs:enable
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
 			dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
-		$sql.= " WHERE ".(isset($this->table_rowid)?$this->table_rowid:'rowid')." = ". $this->id;
+		$sql .= " SET ref_ext = '".$this->db->escape($ref_ext)."'";
+		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -2806,7 +2806,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -2824,26 +2824,26 @@ abstract class CommonObject
         // phpcs:enable
 		global $user;
 
-		if (! $this->table_element)
+		if (!$this->table_element)
 		{
-			$this->error='update_note was called on objet with property table_element not defined';
+			$this->error = 'update_note was called on objet with property table_element not defined';
 			dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if (! in_array($suffix, array('','_public','_private')))
+		if (!in_array($suffix, array('', '_public', '_private')))
 		{
-			$this->error='update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
+			$this->error = 'update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
 			dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
 			return -2;
 		}
 		// Special cas
 		//var_dump($this->table_element);exit;
-		if ($this->table_element == 'product') $suffix='';
+		if ($this->table_element == 'product') $suffix = '';
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL");
-		$sql.= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))?"fk_user_mod":"fk_user_modif")." = ".$user->id;
-		$sql.= " WHERE rowid =". $this->id;
+		$sql .= " SET note".$suffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
+		$sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;
+		$sql .= " WHERE rowid =".$this->id;
 
 		dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -2852,14 +2852,14 @@ abstract class CommonObject
 			elseif ($suffix == '_private') $this->note_private = $note;
 			else
 			{
-				$this->note = $note;      // deprecated
+				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
 			return 1;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -2910,8 +2910,8 @@ abstract class CommonObject
 		elseif ($this->element == 'supplier_proposal')
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
 
-		if (! empty($MODULE)) {
-			if (! empty($conf->global->$MODULE)) {
+		if (!empty($MODULE)) {
+			if (!empty($conf->global->$MODULE)) {
 				$modsactivated = explode(',', $conf->global->$MODULE);
 				foreach ($modsactivated as $mod) {
 					if ($conf->$mod->enabled)
@@ -2922,44 +2922,44 @@ abstract class CommonObject
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') $roundingadjust='auto';	// For backward compatibility
+		if ($roundingadjust == '-1') $roundingadjust = 'auto'; // For backward compatibility
 
-		$forcedroundingmode=$roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
+		$forcedroundingmode = $roundingadjust;
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		elseif ($forcedroundingmode == 'auto') $forcedroundingmode = '0';
 
-		$error=0;
+		$error = 0;
 
 		$multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;
 
 		// Define constants to find lines to sum
-		$fieldtva='total_tva';
-		$fieldlocaltax1='total_localtax1';
-		$fieldlocaltax2='total_localtax2';
-		$fieldup='subprice';
+		$fieldtva = 'total_tva';
+		$fieldlocaltax1 = 'total_localtax1';
+		$fieldlocaltax2 = 'total_localtax2';
+		$fieldup = 'subprice';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
-			$fieldtva='tva';
-			$fieldup='pu_ht';
+			$fieldtva = 'tva';
+			$fieldup = 'pu_ht';
 		}
 		if ($this->element == 'expensereport')
 		{
-			$fieldup='value_unit';
+			$fieldup = 'value_unit';
 		}
 
 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
-		$sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-			if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent';
-			$sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
+		$sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
+			if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';
+			$sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 		if ($exclspec)
 		{
-			$product_field='product_type';
-			if ($this->table_element_line == 'contratdet') $product_field='';    // contratdet table has no product_type field
-			if ($product_field) $sql.= ' AND '.$product_field.' <> 9';
+			$product_field = 'product_type';
+			if ($this->table_element_line == 'contratdet') $product_field = ''; // contratdet table has no product_type field
+			if ($product_field) $sql .= ' AND '.$product_field.' <> 9';
 		}
-		$sql.= ' ORDER by rowid';	// We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
+		$sql .= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
 		dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2973,7 +2973,7 @@ abstract class CommonObject
 			$total_ht_by_vats  = array();
 			$total_tva_by_vats = array();
 			$total_ttc_by_vats = array();
-			$this->multicurrency_total_ht	= 0;
+			$this->multicurrency_total_ht = 0;
 			$this->multicurrency_total_tva	= 0;
 			$this->multicurrency_total_ttc	= 0;
 
@@ -2984,54 +2984,54 @@ abstract class CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				// Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'
-				$parameters=array('fk_element' => $obj->rowid);
+				$parameters = array('fk_element' => $obj->rowid);
 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
 				{
-					$localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx);
-					$tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
-					$diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
+					$localtax_array = array($obj->localtax1_type, $obj->localtax1_tx, $obj->localtax2_type, $obj->localtax2_tx);
+					$tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
+					$diff = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1);
 					if ($diff)
 					{
-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db, 'Failed to update line');
+								$resqlfix = $this->db->query($sqlfix);
+								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
 								$obj->total_tva = $tmpcal[1];
 								$obj->total_ttc = $tmpcal[2];
 						//
 					}
 				}
 
-				$this->total_ht        += $obj->total_ht;		// The field visible at end of line detail
+				$this->total_ht        += $obj->total_ht; // The field visible at end of line detail
 				$this->total_tva       += $obj->total_tva;
 				$this->total_localtax1 += $obj->total_localtax1;
 				$this->total_localtax2 += $obj->total_localtax2;
 				$this->total_ttc       += $obj->total_ttc;
-				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht;		// The field visible at end of line detail
+				$this->multicurrency_total_ht        += $obj->multicurrency_total_ht; // The field visible at end of line detail
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
 
-				if (! isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate]=0;
-				if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0;
-				if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0;
+				if (!isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate] = 0;
+				if (!isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate] = 0;
+				if (!isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate] = 0;
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
 				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
 				{
-					$tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
-					$diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1);
+					$tmpvat = price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
+					$diff = price2num($total_tva_by_vats[$obj->vatrate] - $tmpvat, 'MT', 1);
 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
 					if ($diff)
 					{
 						if (abs($diff) > 0.1) { dol_syslog('A rounding difference was detected into TOTAL but is too high to be corrected', LOG_WARNING); exit; }
-						$sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
+						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-								$resqlfix=$this->db->query($sqlfix);
-								if (! $resqlfix) dol_print_error($this->db, 'Failed to update line');
+								$resqlfix = $this->db->query($sqlfix);
+								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
 								$this->total_tva -= $diff;
 								$this->total_ttc -= $diff;
 								$total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -3043,11 +3043,11 @@ abstract class CommonObject
 			}
 
 			// Add revenue stamp to total
-			$this->total_ttc       			+= isset($this->revenuestamp)?$this->revenuestamp:0;
-			$this->multicurrency_total_ttc  += isset($this->revenuestamp)?($this->revenuestamp * $multicurrency_tx):0;
+			$this->total_ttc += isset($this->revenuestamp) ? $this->revenuestamp : 0;
+			$this->multicurrency_total_ttc += isset($this->revenuestamp) ? ($this->revenuestamp * $multicurrency_tx) : 0;
 
 			// Situations totals
-			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE )
+			if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)
 			{
 				$prev_sits = $this->get_prev_sits();
 
@@ -3066,17 +3066,17 @@ abstract class CommonObject
 			$this->db->free($resql);
 
 			// Now update global field total_ht, total_ttc and tva
-			$fieldht='total_ht';
-			$fieldtva='tva';
-			$fieldlocaltax1='localtax1';
-			$fieldlocaltax2='localtax2';
-			$fieldttc='total_ttc';
+			$fieldht = 'total_ht';
+			$fieldtva = 'tva';
+			$fieldlocaltax1 = 'localtax1';
+			$fieldlocaltax2 = 'localtax2';
+			$fieldttc = 'total_ttc';
 			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht='total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva';
-			if ($this->element == 'propal')                                                $fieldttc='total';
-			if ($this->element == 'expensereport')                                         $fieldtva='total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldttc='total';
+			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht = 'total';
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva = 'total_tva';
+			if ($this->element == 'propal')                                                $fieldttc = 'total';
+			if ($this->element == 'expensereport')                                         $fieldtva = 'total_tva';
+			if ($this->element == 'supplier_proposal')                                     $fieldttc = 'total';
 
 			if (empty($nodatabaseupdate))
 			{
@@ -3093,16 +3093,16 @@ abstract class CommonObject
 
 
 				dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
-				$resql=$this->db->query($sql);
-				if (! $resql)
+				$resql = $this->db->query($sql);
+				if (!$resql)
 				{
 					$error++;
-					$this->error=$this->db->lasterror();
-					$this->errors[]=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				return 1;
 			}
@@ -3130,27 +3130,27 @@ abstract class CommonObject
 	public function add_object_linked($origin = null, $origin_id = null)
 	{
 		// phpcs:enable
-		$origin = (! empty($origin) ? $origin : $this->origin);
-		$origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id);
+		$origin = (!empty($origin) ? $origin : $this->origin);
+		$origin_id = (!empty($origin_id) ? $origin_id : $this->origin_id);
 
 		// Special case
-		if ($origin == 'order') $origin='commande';
-		if ($origin == 'invoice') $origin='facture';
-		if ($origin == 'invoice_template') $origin='facturerec';
-		if ($origin == 'supplierorder') $origin='order_supplier';
+		if ($origin == 'order') $origin = 'commande';
+		if ($origin == 'invoice') $origin = 'facture';
+		if ($origin == 'invoice_template') $origin = 'facturerec';
+		if ($origin == 'supplierorder') $origin = 'order_supplier';
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-		$sql.= "fk_source";
-		$sql.= ", sourcetype";
-		$sql.= ", fk_target";
-		$sql.= ", targettype";
-		$sql.= ") VALUES (";
-		$sql.= $origin_id;
-		$sql.= ", '".$this->db->escape($origin)."'";
-		$sql.= ", ".$this->id;
-		$sql.= ", '".$this->db->escape($this->element)."'";
-		$sql.= ")";
+		$sql .= "fk_source";
+		$sql .= ", sourcetype";
+		$sql .= ", fk_target";
+		$sql .= ", targettype";
+		$sql .= ") VALUES (";
+		$sql .= $origin_id;
+		$sql .= ", '".$this->db->escape($origin)."'";
+		$sql .= ", ".$this->id;
+		$sql .= ", '".$this->db->escape($this->element)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::add_object_linked", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -3160,7 +3160,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return 0;
 		}
@@ -3192,29 +3192,29 @@ abstract class CommonObject
 	{
 		global $conf;
 
-		$this->linkedObjectsIds=array();
-		$this->linkedObjects=array();
+		$this->linkedObjectsIds = array();
+		$this->linkedObjects = array();
 
-		$justsource=false;
-		$justtarget=false;
-		$withtargettype=false;
-		$withsourcetype=false;
+		$justsource = false;
+		$justtarget = false;
+		$withtargettype = false;
+		$withsourcetype = false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid))
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid))
 		{
-			$justsource=true;  // the source (id and type) is a search criteria
-			if (! empty($targettype)) $withtargettype=true;
+			$justsource = true; // the source (id and type) is a search criteria
+			if (!empty($targettype)) $withtargettype = true;
 		}
-		if (! empty($targetid) && ! empty($targettype) && empty($sourceid))
+		if (!empty($targetid) && !empty($targettype) && empty($sourceid))
 		{
-			$justtarget=true;  // the target (id and type) is a search criteria
-			if (! empty($sourcetype)) $withsourcetype=true;
+			$justtarget = true; // the target (id and type) is a search criteria
+			if (!empty($sourcetype)) $withsourcetype = true;
 		}
 
-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
-		$targetid = (! empty($targetid) ? $targetid : $this->id);
-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
-		$targettype = (! empty($targettype) ? $targettype : $this->element);
+		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
+		$targetid = (!empty($targetid) ? $targetid : $this->id);
+		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
+		$targettype = (!empty($targettype) ? $targettype : $this->element);
 
 		/*if (empty($sourceid) && empty($targetid))
 		 {
@@ -3224,25 +3224,25 @@ abstract class CommonObject
 
 		// Links between objects are stored in table element_element
 		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'element_element';
-		$sql.= " WHERE ";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_element';
+		$sql .= " WHERE ";
 		if ($justsource || $justtarget)
 		{
 			if ($justsource)
 			{
-				$sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
+				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
+				if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";
 			}
 			elseif ($justtarget)
 			{
-				$sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
+				$sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
+				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";
 			}
 		}
 		else
 		{
-			$sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
-			$sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
+			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
+			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
 		}
 		$sql .= ' ORDER BY '.$orderby;
 
@@ -3259,31 +3259,31 @@ abstract class CommonObject
 				{
 					if ($justsource)
 					{
-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
+						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
 					}
 					elseif ($justtarget)
 					{
-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
+						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
 				}
 				else
 				{
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
-						$this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target;
+						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
 					}
 					if ($obj->fk_target == $targetid && $obj->targettype == $targettype)
 					{
-						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source;
+						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
 				}
 				$i++;
 			}
 
-			if (! empty($this->linkedObjectsIds))
+			if (!empty($this->linkedObjectsIds))
 			{
 				$tmparray = $this->linkedObjectsIds;
-				foreach($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
+				foreach ($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
@@ -3296,31 +3296,31 @@ abstract class CommonObject
 
 					$classpath = $element.'/class';
 					// To work with non standard classpath or module name
-					if ($objecttype == 'facture')			{
+					if ($objecttype == 'facture') {
 						$classpath = 'compta/facture/class';
 					}
-					elseif ($objecttype == 'facturerec')			{
+					elseif ($objecttype == 'facturerec') {
 						$classpath = 'compta/facture/class'; $module = 'facture';
 					}
-					elseif ($objecttype == 'propal')			{
+					elseif ($objecttype == 'propal') {
 						$classpath = 'comm/propal/class';
 					}
-					elseif ($objecttype == 'supplier_proposal')			{
+					elseif ($objecttype == 'supplier_proposal') {
 						$classpath = 'supplier_proposal/class';
 					}
-					elseif ($objecttype == 'shipping')			{
+					elseif ($objecttype == 'shipping') {
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
 					}
-					elseif ($objecttype == 'delivery')			{
+					elseif ($objecttype == 'delivery') {
 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
 					}
-					elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier')	{
+					elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
 						$classpath = 'fourn/class'; $module = 'fournisseur';
 					}
-					elseif ($objecttype == 'fichinter')			{
+					elseif ($objecttype == 'fichinter') {
 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
 					}
-					elseif ($objecttype == 'subscription')			{
+					elseif ($objecttype == 'subscription') {
 						$classpath = 'adherents/class'; $module = 'adherent';
 					}
 
@@ -3333,16 +3333,16 @@ abstract class CommonObject
 					elseif ($objecttype == 'invoice_supplier') {
 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
 					}
-					elseif ($objecttype == 'order_supplier')   {
+					elseif ($objecttype == 'order_supplier') {
 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
 					}
-					elseif ($objecttype == 'supplier_proposal')   {
+					elseif ($objecttype == 'supplier_proposal') {
 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
 					}
-					elseif ($objecttype == 'facturerec')   {
+					elseif ($objecttype == 'facturerec') {
 						$classfile = 'facture-rec'; $classname = 'FactureRec';
 					}
-					elseif ($objecttype == 'subscription')   {
+					elseif ($objecttype == 'subscription') {
 						$classfile = 'subscription'; $classname = 'Subscription';
 					}
 
@@ -3355,7 +3355,7 @@ abstract class CommonObject
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
 							if (class_exists($classname))
 							{
-								foreach($objectids as $i => $objectid)	// $i is rowid into llx_element_element
+								foreach ($objectids as $i => $objectid)	// $i is rowid into llx_element_element
 								{
 									$object = new $classname($this->db);
 									$ret = $object->fetch($objectid);
@@ -3394,26 +3394,26 @@ abstract class CommonObject
 	 */
 	public function updateObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '')
 	{
-		$updatesource=false;
-		$updatetarget=false;
+		$updatesource = false;
+		$updatetarget = false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true;
-		elseif (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
+		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET ";
 		if ($updatesource)
 		{
-			$sql.= "fk_source = ".$sourceid;
-			$sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'";
-			$sql.= " WHERE fk_target = ".$this->id;
-			$sql.= " AND targettype = '".$this->db->escape($this->element)."'";
+			$sql .= "fk_source = ".$sourceid;
+			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";
+			$sql .= " WHERE fk_target = ".$this->id;
+			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";
 		}
 		elseif ($updatetarget)
 		{
-			$sql.= "fk_target = ".$targetid;
-			$sql.= ", targettype = '".$this->db->escape($targettype)."'";
-			$sql.= " WHERE fk_source = ".$this->id;
-			$sql.= " AND sourcetype = '".$this->db->escape($this->element)."'";
+			$sql .= "fk_target = ".$targetid;
+			$sql .= ", targettype = '".$this->db->escape($targettype)."'";
+			$sql .= " WHERE fk_source = ".$this->id;
+			$sql .= " AND sourcetype = '".$this->db->escape($this->element)."'";
 		}
 
 		dol_syslog(get_class($this)."::updateObjectLinked", LOG_DEBUG);
@@ -3423,7 +3423,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -3441,40 +3441,40 @@ abstract class CommonObject
 	 */
 	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '')
 	{
-		$deletesource=false;
-		$deletetarget=false;
+		$deletesource = false;
+		$deletetarget = false;
 
-		if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true;
-		elseif (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;
+		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;
 
-		$sourceid = (! empty($sourceid) ? $sourceid : $this->id);
-		$sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element);
-		$targetid = (! empty($targetid) ? $targetid : $this->id);
-		$targettype = (! empty($targettype) ? $targettype : $this->element);
+		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
+		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
+		$targetid = (!empty($targetid) ? $targetid : $this->id);
+		$targettype = (!empty($targettype) ? $targettype : $this->element);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_element";
-		$sql.= " WHERE";
+		$sql .= " WHERE";
 		if ($rowid > 0)
 		{
-			$sql.=" rowid = ".$rowid;
+			$sql .= " rowid = ".$rowid;
 		}
 		else
 		{
 			if ($deletesource)
 			{
-				$sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
-				$sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
+				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
 			}
 			elseif ($deletetarget)
 			{
-				$sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
-				$sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
+				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
+				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
 			}
 			else
 			{
-				$sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
-				$sql.= " OR";
-				$sql.= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
+				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
+				$sql .= " OR";
+				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
 			}
 		}
 
@@ -3485,8 +3485,8 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->error;
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
 			return -1;
 		}
 	}
@@ -3502,28 +3502,28 @@ abstract class CommonObject
 	 */
 	public function setStatut($status, $elementId = null, $elementType = '', $trigkey = '')
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		$savElementId=$elementId;  // To be used later to know if we were using the method using the id of this or not.
+		$savElementId = $elementId; // To be used later to know if we were using the method using the id of this or not.
 
-		$elementId = (!empty($elementId)?$elementId:$this->id);
-		$elementTable = (!empty($elementType)?$elementType:$this->table_element);
+		$elementId = (!empty($elementId) ? $elementId : $this->id);
+		$elementTable = (!empty($elementType) ? $elementType : $this->table_element);
 
 		$this->db->begin();
 
-		$fieldstatus="fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus="suspended";
-		if ($elementTable == 'mailing') $fieldstatus="statut";
-		if ($elementTable == 'cronjob') $fieldstatus="status";
-		if ($elementTable == 'user') $fieldstatus="statut";
-		if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
+		$fieldstatus = "fk_statut";
+		if ($elementTable == 'facture_rec') $fieldstatus = "suspended";
+		if ($elementTable == 'mailing') $fieldstatus = "statut";
+		if ($elementTable == 'cronjob') $fieldstatus = "status";
+		if ($elementTable == 'user') $fieldstatus = "statut";
+		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
+		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
-		$sql.= " SET ".$fieldstatus." = ".$status;
+		$sql .= " SET ".$fieldstatus." = ".$status;
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id;
-		$sql.= " WHERE rowid=".$elementId;
+		if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;
+		$sql .= " WHERE rowid=".$elementId;
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -3533,27 +3533,27 @@ abstract class CommonObject
 			// Try autoset of trigkey
 			if (empty($trigkey))
 			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN';   // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE';  // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED';
+				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+				if ($this->element == 'fichinter' && $status == 3) $trigkey = 'FICHINTER_CLASSIFY_DONE';
+				if ($this->element == 'fichinter' && $status == 2) $trigkey = 'FICHINTER_CLASSIFY_BILLED';
+				if ($this->element == 'fichinter' && $status == 1) $trigkey = 'FICHINTER_CLASSIFY_UNBILLED';
 			}
 
 			if ($trigkey)
 			{
 				// Appel des triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers($trigkey, $this, $user, $langs, $conf);
+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+				$interface = new Interfaces($this->db);
+				$result = $interface->run_triggers($trigkey, $this, $user, $langs, $conf);
 				if ($result < 0) {
-					$error++; $this->errors=$interface->errors;
+					$error++; $this->errors = $interface->errors;
 				}
 				// Fin appel triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 
@@ -3574,7 +3574,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -3593,16 +3593,16 @@ abstract class CommonObject
 		global $conf;
 
 		if (empty($id) && empty($ref)) return 0;
-		if (! empty($conf->global->MAIN_DISABLE_CANVAS)) return 0;    // To increase speed. Not enabled by default.
+		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0; // To increase speed. Not enabled by default.
 
 		// Clean parameters
 		$ref = trim($ref);
 
 		$sql = "SELECT rowid, canvas";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " WHERE entity IN (".getEntity($this->element).")";
-		if (! empty($id))  $sql.= " AND rowid = ".$id;
-		if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE entity IN (".getEntity($this->element).")";
+		if (!empty($id))  $sql .= " AND rowid = ".$id;
+		if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3610,7 +3610,7 @@ abstract class CommonObject
 			$obj = $this->db->fetch_object($resql);
 			if ($obj)
 			{
-				$this->canvas   = $obj->canvas;
+				$this->canvas = $obj->canvas;
 				return 1;
 			}
 			else return 0;
@@ -3632,7 +3632,7 @@ abstract class CommonObject
 	public function getSpecialCode($lineid)
 	{
 		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= ' WHERE rowid = '.$lineid;
+		$sql .= ' WHERE rowid = '.$lineid;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3652,10 +3652,10 @@ abstract class CommonObject
 	{
 		global $langs;
 
-		if (empty($id)) $id=$this->id;
+		if (empty($id)) $id = $this->id;
 
 		// Check parameters
-		if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0)
+		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0)
 		{
 			dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');
 			return -1;
@@ -3663,24 +3663,24 @@ abstract class CommonObject
 
 		$arraytoscan = $this->childtables;
 		// For backward compatibility, we check if array is old format array('table1', 'table2', ...)
-		$tmparray=array_keys($this->childtables);
+		$tmparray = array_keys($this->childtables);
 		if (is_numeric($tmparray[0]))
 		{
 			$arraytoscan = array_flip($this->childtables);
 		}
 
 		// Test if child exists
-		$haschild=0;
-		foreach($arraytoscan as $table => $elementname)
+		$haschild = 0;
+		foreach ($arraytoscan as $table => $elementname)
 		{
 			//print $id.'-'.$table.'-'.$elementname.'<br>';
 			// Check if third party can be deleted
 			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;
-			$sql.= " WHERE ".$this->fk_element." = ".$id;
-			$resql=$this->db->query($sql);
+			$sql .= " WHERE ".$this->fk_element." = ".$id;
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$obj=$this->db->fetch_object($resql);
+				$obj = $this->db->fetch_object($resql);
 				if ($obj->nb > 0)
 				{
 					$langs->load("errors");
@@ -3688,24 +3688,24 @@ abstract class CommonObject
 					$haschild += $obj->nb;
 					if (is_numeric($elementname))	// old usage
 					{
-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
 					}
 					else	// new usage: $elementname=Translation key
 					{
-						$this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
+						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
-					break;    // We found at least one, we stop here
+					break; // We found at least one, we stop here
 				}
 			}
 			else
 			{
-				$this->errors[]=$this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
 		}
 		if ($haschild > 0)
 		{
-			$this->errors[]="ErrorRecordHasChildren";
+			$this->errors[] = "ErrorRecordHasChildren";
 			return $haschild;
 		}
 		else return 0;
@@ -3719,16 +3719,16 @@ abstract class CommonObject
 	 */
 	public function hasProductsOrServices($predefined = -1)
 	{
-		$nb=0;
+		$nb = 0;
 
-		foreach($this->lines as $key => $val)
+		foreach ($this->lines as $key => $val)
 		{
-			$qualified=0;
-			if ($predefined == -1) $qualified=1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified=1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified=1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1;
+			$qualified = 0;
+			if ($predefined == -1) $qualified = 1;
+			if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;
+			if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;
 			if ($qualified) $nb++;
 		}
 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
@@ -3742,24 +3742,24 @@ abstract class CommonObject
 	 */
 	public function getTotalDiscount()
 	{
-		$total_discount=0.00;
+		$total_discount = 0.00;
 
 		$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
-		$sql.= " WHERE ".$this->fk_element." = ".$this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element."det";
+		$sql .= " WHERE ".$this->fk_element." = ".$this->id;
 
 		dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
 				$pu_ht = $obj->pu_ht;
-				$qty= $obj->qty;
+				$qty = $obj->qty;
 				$total_ht = $obj->total_ht;
 
 				$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));
@@ -3793,18 +3793,18 @@ abstract class CommonObject
 		{
 			if (isset($line->qty_asked))
 			{
-				if (empty($totalOrdered)) $totalOrdered=0;  // Avoid warning because $totalOrdered is ''
-				$totalOrdered+=$line->qty_asked;    // defined for shipment only
+				if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''
+				$totalOrdered += $line->qty_asked; // defined for shipment only
 			}
 			if (isset($line->qty_shipped))
 			{
-				if (empty($totalToShip)) $totalToShip=0;    // Avoid warning because $totalToShip is ''
-				$totalToShip+=$line->qty_shipped;   // defined for shipment only
+				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
+				$totalToShip += $line->qty_shipped; // defined for shipment only
 			}
 			elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
 			{
-				if (empty($totalToShip)) $totalToShip=0;
-				$totalToShip+=$line->qty;   // defined for reception only
+				if (empty($totalToShip)) $totalToShip = 0;
+				$totalToShip += $line->qty; // defined for reception only
 			}
 
 			// Define qty, weight, volume, weight_units, volume_units
@@ -3817,27 +3817,27 @@ abstract class CommonObject
 			}
 
 			$weight = $line->weight ? $line->weight : 0;
-            ($weight==0 && !empty($line->product->weight))? $weight=$line->product->weight: 0;
+            ($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;
 			$volume = $line->volume ? $line->volume : 0;
-			($volume==0 && !empty($line->product->volume))? $volume=$line->product->volume: 0;
+			($volume == 0 && !empty($line->product->volume)) ? $volume = $line->product->volume : 0;
 
-			$weight_units=$line->weight_units;
-			($weight_units==0 && !empty($line->product->weight_units))? $weight_units=$line->product->weight_units: 0;
-			$volume_units=$line->volume_units;
-			($volume_units==0 && !empty($line->product->volume_units))? $volume_units=$line->product->volume_units: 0;
+			$weight_units = $line->weight_units;
+			($weight_units == 0 && !empty($line->product->weight_units)) ? $weight_units = $line->product->weight_units : 0;
+			$volume_units = $line->volume_units;
+			($volume_units == 0 && !empty($line->product->volume_units)) ? $volume_units = $line->product->volume_units : 0;
 
-			$weightUnit=0;
-			$volumeUnit=0;
-			if (! empty($weight_units)) $weightUnit = $weight_units;
-			if (! empty($volume_units)) $volumeUnit = $volume_units;
+			$weightUnit = 0;
+			$volumeUnit = 0;
+			if (!empty($weight_units)) $weightUnit = $weight_units;
+			if (!empty($volume_units)) $volumeUnit = $volume_units;
 
-			if (empty($totalWeight)) $totalWeight=0;  // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume=0;  // Avoid warning because $totalVolume is ''
+			if (empty($totalWeight)) $totalWeight = 0; // Avoid warning because $totalWeight is ''
+			if (empty($totalVolume)) $totalVolume = 0; // Avoid warning because $totalVolume is ''
 
 			//var_dump($line->volume_units);
 			if ($weight_units < 50)   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
-				$trueWeightUnit=pow(10, $weightUnit);
+				$trueWeightUnit = pow(10, $weightUnit);
 				$totalWeight += $weight * $qty * $trueWeightUnit;
 			}
 			else {
@@ -3880,17 +3880,17 @@ abstract class CommonObject
 	{
 		$this->db->begin();
 
-		$extraparams = (! empty($this->extraparams) ? json_encode($this->extraparams) : null);
+		$extraparams = (!empty($this->extraparams) ? json_encode($this->extraparams) : null);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET extraparams = ".(! empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET extraparams = ".(!empty($extraparams) ? "'".$this->db->escape($extraparams)."'" : "null");
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -3925,7 +3925,7 @@ abstract class CommonObject
 			}
 		}
 
-		$out .= (($res->code && $this->location_incoterms)?' - ':'').$this->location_incoterms;
+		$out .= (($res->code && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;
 
 		return $out;
 	}
@@ -3971,11 +3971,11 @@ abstract class CommonObject
 		if ($this->id && $this->table_element)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
-			$sql.= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
-			$sql.= " WHERE rowid = " . $this->id;
+			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
+			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
+			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->fk_incoterms = $id_incoterm;
@@ -4030,8 +4030,8 @@ abstract class CommonObject
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
-		$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-		foreach($dirtpls as $module => $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+		foreach ($dirtpls as $module => $reldir)
 		{
 			if (!empty($module))
 			{
@@ -4043,9 +4043,9 @@ abstract class CommonObject
 			}
 
 			if (empty($conf->file->strict_mode)) {
-				$res=@include $tpl;
+				$res = @include $tpl;
 			} else {
-				$res=include $tpl; // for debug
+				$res = include $tpl; // for debug
 			}
 			if ($res) break;
 		}
@@ -4077,13 +4077,13 @@ abstract class CommonObject
 		global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
 
 		// Define usemargins
-		$usemargins=0;
-		if (! empty($conf->margin->enabled) && ! empty($this->element) && in_array($this->element, array('facture','facturerec','propal','commande'))) $usemargins=1;
+		$usemargins = 0;
+		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;
 
 		$num = count($this->lines);
 
 		// Line extrafield
-		if (! is_object($extrafields))
+		if (!is_object($extrafields))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
@@ -4096,8 +4096,8 @@ abstract class CommonObject
 		{
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-			foreach($dirtpls as $module => $reldir)
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+			foreach ($dirtpls as $module => $reldir)
 			{
 				if (!empty($module))
 				{
@@ -4194,12 +4194,12 @@ abstract class CommonObject
 
 				$product_static->ref = $line->ref; //can change ref in hook
 				$product_static->label = $line->label; //can change label in hook
-				$text=$product_static->getNomUrl(1);
+				$text = $product_static->getNomUrl(1);
 
 				// Define output language and label
-				if (! empty($conf->global->MAIN_MULTILANGS))
+				if (!empty($conf->global->MAIN_MULTILANGS))
 				{
-					if (property_exists($this, 'socid') && ! is_object($this->thirdparty))
+					if (property_exists($this, 'socid') && !is_object($this->thirdparty))
 					{
 						dol_print_error('', 'Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');
 						return;
@@ -4209,32 +4209,32 @@ abstract class CommonObject
 					$prod->fetch($line->fk_product);
 
 					$outputlangs = $langs;
-					$newlang='';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang=GETPOST('lang_id', 'aZ09');
-					if (! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) $newlang=$this->thirdparty->default_lang;		// To use language of customer
-					if (! empty($newlang))
+					$newlang = '';
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) $newlang = $this->thirdparty->default_lang; // To use language of customer
+					if (!empty($newlang))
 					{
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
 
-					$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
+					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
 				}
 				else
 				{
 					$label = $line->product_label;
 				}
 
-				$text.= ' - '.(! empty($line->label)?$line->label:$label);
-				$description.=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description));	// Description is what to show on popup. We shown nothing if already into desc.
+				$text .= ' - '.(!empty($line->label) ? $line->label : $label);
+				$description .= (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.
 			}
 
-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-			foreach($dirtpls as $module => $reldir)
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+			foreach ($dirtpls as $module => $reldir)
 			{
 				if (!empty($module))
 				{
@@ -4246,9 +4246,9 @@ abstract class CommonObject
 				}
 
 				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
+					$res = @include $tpl;
 				} else {
-					$res=include $tpl; // for debug
+					$res = include $tpl; // for debug
 				}
 				if ($res) break;
 			}
@@ -4257,15 +4257,15 @@ abstract class CommonObject
 		// Line in update mode
 		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)
 		{
-			$label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
-			$placeholder=' placeholder="'.$langs->trans("Label").'"';
+			$label = (!empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
+			$placeholder = ' placeholder="'.$langs->trans("Label").'"';
 
-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
-			$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-			foreach($dirtpls as $module => $reldir)
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+			foreach ($dirtpls as $module => $reldir)
 			{
 				if (!empty($module))
 				{
@@ -4277,9 +4277,9 @@ abstract class CommonObject
 				}
 
 				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
+					$res = @include $tpl;
 				} else {
-					$res=include $tpl; // for debug
+					$res = include $tpl; // for debug
 				}
 				if ($res) break;
 			}
@@ -4311,7 +4311,7 @@ abstract class CommonObject
 		print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
 		if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
 		print '<td class="right">'.$langs->trans('Qty').'</td>';
-		if($conf->global->PRODUCT_USE_UNITS)
+		if ($conf->global->PRODUCT_USE_UNITS)
 		{
 			print '<td class="left">'.$langs->trans('Unit').'</td>';
 		}
@@ -4363,35 +4363,35 @@ abstract class CommonObject
 		//var_dump($line);
 		if (!empty($line->date_start))
 		{
-			$date_start=$line->date_start;
+			$date_start = $line->date_start;
 		}
 		else
 		{
-			$date_start=$line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start=$line->date_debut_reel;
+			$date_start = $line->date_debut_prevue;
+			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
 		}
 		if (!empty($line->date_end))
 		{
-			$date_end=$line->date_end;
+			$date_end = $line->date_end;
 		}
 		else
 		{
-			$date_end=$line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end=$line->date_fin_reel;
+			$date_end = $line->date_fin_prevue;
+			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
 		}
 
         $this->tpl['id'] = $line->id;
 
 		$this->tpl['label'] = '';
-		if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow');
+		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');
 
 		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
 		{
-			$discount=new DiscountAbsolute($this->db);
+			$discount = new DiscountAbsolute($this->db);
 			$discount->fk_soc = $this->socid;
-			$this->tpl['label'].= $discount->getNomUrl(0, 'discount');
+			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
 		}
-		elseif (! empty($line->fk_product))
+		elseif (!empty($line->fk_product))
 		{
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
@@ -4402,53 +4402,53 @@ abstract class CommonObject
 				$productstatic = $line->product;
 			}
 
-			$this->tpl['label'].= $productstatic->getNomUrl(1);
-			$this->tpl['label'].= ' - '.(! empty($line->label)?$line->label:$line->product_label);
+			$this->tpl['label'] .= $productstatic->getNomUrl(1);
+			$this->tpl['label'] .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 			// Dates
 			if ($line->product_type == 1 && ($date_start || $date_end))
 			{
-				$this->tpl['label'].= get_date_range($date_start, $date_end);
+				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
 		}
 		else
 		{
-			$this->tpl['label'].= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
+			$this->tpl['label'] .= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
 			if (!empty($line->desc)) {
-				$this->tpl['label'].=$line->desc;
-			}else {
-				$this->tpl['label'].= ($line->label ? '&nbsp;'.$line->label : '');
+				$this->tpl['label'] .= $line->desc;
+			} else {
+				$this->tpl['label'] .= ($line->label ? '&nbsp;'.$line->label : '');
 			}
 
 			// Dates
 			if ($line->product_type == 1 && ($date_start || $date_end))
 			{
-				$this->tpl['label'].= get_date_range($date_start, $date_end);
+				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
 		}
 
-		if (! empty($line->desc))
+		if (!empty($line->desc))
 		{
 			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 			}
 			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 			}
 			elseif ($line->desc == '(EXCESS RECEIVED)')
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
 			}
 			elseif ($line->desc == '(EXCESS PAID)')
 			{
-				$discount=new DiscountAbsolute($this->db);
+				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 			}
@@ -4465,7 +4465,7 @@ abstract class CommonObject
         // VAT Rate
         $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
         $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
@@ -4474,13 +4474,13 @@ abstract class CommonObject
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
-		$this->tpl['strike']=0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1;
+		$this->tpl['strike'] = 0;
+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
-		$dirtpls=array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-		foreach($dirtpls as $module => $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+		foreach ($dirtpls as $module => $reldir)
 		{
 			if (!empty($module))
 			{
@@ -4492,9 +4492,9 @@ abstract class CommonObject
 			}
 
 			if (empty($conf->file->strict_mode)) {
-				$res=@include $tpl;
+				$res = @include $tpl;
 			} else {
-				$res=include $tpl; // for debug
+				$res = include $tpl; // for debug
 			}
 			if ($res) break;
 		}
@@ -4518,20 +4518,20 @@ abstract class CommonObject
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";
-		$sql.= "resource_id";
-		$sql.= ", resource_type";
-		$sql.= ", element_id";
-		$sql.= ", element_type";
-		$sql.= ", busy";
-		$sql.= ", mandatory";
-		$sql.= ") VALUES (";
-		$sql.= $resource_id;
-		$sql.= ", '".$this->db->escape($resource_type)."'";
-		$sql.= ", '".$this->db->escape($this->id)."'";
-		$sql.= ", '".$this->db->escape($this->element)."'";
-		$sql.= ", '".$this->db->escape($busy)."'";
-		$sql.= ", '".$this->db->escape($mandatory)."'";
-		$sql.= ")";
+		$sql .= "resource_id";
+		$sql .= ", resource_type";
+		$sql .= ", element_id";
+		$sql .= ", element_type";
+		$sql .= ", busy";
+		$sql .= ", mandatory";
+		$sql .= ") VALUES (";
+		$sql .= $resource_id;
+		$sql .= ", '".$this->db->escape($resource_type)."'";
+		$sql .= ", '".$this->db->escape($this->id)."'";
+		$sql .= ", '".$this->db->escape($this->element)."'";
+		$sql .= ", '".$this->db->escape($busy)."'";
+		$sql .= ", '".$this->db->escape($mandatory)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);
 		if ($this->db->query($sql))
@@ -4541,7 +4541,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return  0;
 		}
@@ -4564,22 +4564,22 @@ abstract class CommonObject
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_resources";
-		$sql.= " WHERE rowid=".$rowid;
+		$sql .= " WHERE rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
-		if (! $resql)
+		$resql = $this->db->query($sql);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
 		else
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
-				$result=$this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
+				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
 				if ($result < 0) { $this->db->rollback(); return -1; }
 			}
 			$this->db->commit();
@@ -4598,8 +4598,8 @@ abstract class CommonObject
 		// Force a copy of this->lines, otherwise it will point to same object.
 		if (isset($this->lines) && is_array($this->lines))
 		{
-			$nboflines=count($this->lines);
-			for($i=0; $i < $nboflines; $i++)
+			$nboflines = count($this->lines);
+			for ($i = 0; $i < $nboflines; $i++)
 			{
 				$this->lines[$i] = clone $this->lines[$i];
 			}
@@ -4888,9 +4888,9 @@ abstract class CommonObject
 	{
 		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...
 
-		$file_osencoded=dol_osencode($file);
+		$file_osencoded = dol_osencode($file);
 		if (file_exists($file_osencoded))
 		{
 			// Create small thumbs for company (Ratio is near 16/9)
@@ -4929,16 +4929,16 @@ abstract class CommonObject
 
 		if (isset($alternatevalue)) return $alternatevalue;
 
-		$newelement=$this->element;
-		if ($newelement == 'facture') $newelement='invoice';
-		if ($newelement == 'commande') $newelement='order';
+		$newelement = $this->element;
+		if ($newelement == 'facture') $newelement = 'invoice';
+		if ($newelement == 'commande') $newelement = 'order';
 		if (empty($newelement))
 		{
 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
 			return '';
 		}
 
-		$keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname);
+		$keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
 		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
 
@@ -5006,19 +5006,19 @@ abstract class CommonObject
 		// phpcs:enable
 		global $extrafields;
 
-		if (empty($rowid)) $rowid=$this->id;
+		if (empty($rowid)) $rowid = $this->id;
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
 			return 0;
 		}
 
-		$this->array_options=array();
+		$this->array_options = array();
 
-		if (! is_array($optionsArray))
+		if (!is_array($optionsArray))
 		{
 			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
-			if (! isset($extrafields) || ! is_object($extrafields))
+			if (!isset($extrafields) || !is_object($extrafields))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 				$extrafields = new ExtraFields($this->db);
@@ -5029,7 +5029,7 @@ abstract class CommonObject
 			{
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
-			$optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null);
+			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);
 		}
 		else
 		{
@@ -5048,18 +5048,18 @@ abstract class CommonObject
 			{
 				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
 				{
-					$sql.= ", ".$name;
+					$sql .= ", ".$name;
 				}
 			}
-			$sql.= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
-			$sql.= " WHERE fk_object = ".$rowid;
+			$sql .= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
+			$sql .= " WHERE fk_object = ".$rowid;
 
 			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->array_options = array();
-				$numrows=$this->db->num_rows($resql);
+				$numrows = $this->db->num_rows($resql);
 				if ($numrows)
 				{
 					$tab = $this->db->fetch_array($resql);
@@ -5067,17 +5067,17 @@ abstract class CommonObject
 					foreach ($tab as $key => $value)
 					{
 						// Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)
-						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && ! is_int($key))
+						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key))
 						{
 							// we can add this attribute to object
-							if (! empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
+							if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
 							{
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
-								$this->array_options["options_".$key]=$this->db->jdate($value);
+								$this->array_options["options_".$key] = $this->db->jdate($value);
 							}
 							else
 							{
-								$this->array_options["options_".$key]=$value;
+								$this->array_options["options_".$key] = $value;
 							}
 
 							//var_dump('key '.$key.' '.$value.' type='.$extrafields->attributes[$this->table_element]['type'][$key].' '.$this->array_options["options_".$key]);
@@ -5086,7 +5086,7 @@ abstract class CommonObject
 
 					// If field is a computed field, value must become result of compute
 					foreach ($tab as $key => $value) {
-						if (! empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key]))
+						if (!empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key]))
 						{
 							$this->array_options["options_".$key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0);
 						}
@@ -5121,10 +5121,10 @@ abstract class CommonObject
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
-		$resql=$this->db->query($sql_del);
-		if (! $resql)
+		$resql = $this->db->query($sql_del);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -5147,24 +5147,24 @@ abstract class CommonObject
 	 */
 	public function insertExtraFields($trigger = '', $userused = null)
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
-		$error=0;
+		$error = 0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
 
-		if (! empty($this->array_options))
+		if (!empty($this->array_options))
 		{
 			// Check parameters
 			$langs->load('admin');
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+			$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
 
 			//Eliminate copied source object extra_fields that do not exist in target object
-			$new_array_options=array();
+			$new_array_options = array();
 			foreach ($this->array_options as $key => $value) {
 				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
 					$new_array_options[$key] = $value;
@@ -5172,9 +5172,9 @@ abstract class CommonObject
 					$new_array_options['options_'.$key] = $value;
 			}
 
-			foreach($new_array_options as $key => $value)
+			foreach ($new_array_options as $key => $value)
 			{
-			   	$attributeKey      = substr($key, 8);   // Remove 'options_' prefix
+			   	$attributeKey      = substr($key, 8); // Remove 'options_' prefix
 			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
 			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
 			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
@@ -5184,13 +5184,13 @@ abstract class CommonObject
 
 			   	if ($attributeRequired)
 			   	{
-			   		$mandatorypb=false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true;
-			   		if ($this->array_options[$key] === '') $mandatorypb=true;
+			   		$mandatorypb = false;
+			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
+			   		if ($this->array_options[$key] === '') $mandatorypb = true;
 			   		if ($mandatorypb)
 			   		{
 			   		    dol_syslog("Mandatory extra field ".$key." is empty");
-			   			$this->errors[]=$langs->trans('ErrorFieldRequired', $attributeLabel);
+			   			$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
 			   			return -1;
 			   		}
 			   	}
@@ -5216,25 +5216,25 @@ abstract class CommonObject
 			   	switch ($attributeType)
 			   	{
 			   		case 'int':
-			  			if (!is_numeric($value) && $value!='')
+			  			if (!is_numeric($value) && $value != '')
 			   			{
-			   				$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 			   				return -1;
 			  			}
-			   			elseif ($value=='')
+			   			elseif ($value == '')
 			   			{
 			   				$new_array_options[$key] = null;
 			   			}
 			 			break;
 					case 'double':
 						$value = price2num($value);
-						if (!is_numeric($value) && $value!='')
+						if (!is_numeric($value) && $value != '')
 						{
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
-							$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
 						}
-						elseif ($value=='')
+						elseif ($value == '')
 						{
 							$new_array_options[$key] = null;
 						}
@@ -5248,12 +5248,12 @@ abstract class CommonObject
              			}
              			break;*/
 			   		case 'password':
-			   			$algo='';
+			   			$algo = '';
 			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
 			   			{
 			   				// If there is an encryption choice, we use it to crypt data before insert
 			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
-			   				$algo=reset($tmparrays);
+			   				$algo = reset($tmparrays);
 			   				if ($algo != '')
 			   				{
 			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
@@ -5264,7 +5264,7 @@ abstract class CommonObject
 			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
-				   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
+				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 				   					}
 									else
 									{
@@ -5275,7 +5275,7 @@ abstract class CommonObject
 			   					}
 			   					else
 			   					{
-			   						$new_array_options[$key] = $this->array_options[$key];	// Value is kept
+			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 			   					}
 			   				}
 			   			}
@@ -5290,13 +5290,13 @@ abstract class CommonObject
 					case 'date':
 					case 'datetime':
 						// If data is a string instead of a timestamp, we convert it
-						if (! is_int($this->array_options[$key])) {
+						if (!is_int($this->array_options[$key])) {
 							$this->array_options[$key] = strtotime($this->array_options[$key]);
 						}
 						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);
 						break;
 		   			case 'link':
-						$param_list=array_keys($attributeParam['options']);
+						$param_list = array_keys($attributeParam['options']);
 						// 0 : ObjectName
 						// 1 : classPath
 						$InfoFieldList = explode(":", $param_list[0]);
@@ -5305,18 +5305,18 @@ abstract class CommonObject
 						{
 							if ($value == '-1')	// -1 is key for no defined in combo list of objects
 							{
-								$new_array_options[$key]='';
+								$new_array_options[$key] = '';
 							}
 							elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res=$object->fetch($value);
-								else $res=$object->fetch('', $value);
+								if (is_numeric($value)) $res = $object->fetch($value);
+								else $res = $object->fetch('', $value);
 
-								if ($res > 0) $new_array_options[$key]=$object->id;
+								if ($res > 0) $new_array_options[$key] = $object->id;
 								else
 								{
-									$this->error="Id/Ref '".$value."' for object '".$object->element."' not found";
+									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
 								}
@@ -5341,70 +5341,70 @@ abstract class CommonObject
 			$this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
-			foreach($new_array_options as $key => $value)
+			foreach ($new_array_options as $key => $value)
 			{
-				$attributeKey = substr($key, 8);   // Remove 'options_' prefix
+				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribut
 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
-					$sql.=",".$attributeKey;
+					$sql .= ",".$attributeKey;
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
-    			foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+    			foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
     			    {
-    			        $sql.=",".$tmpkey;
+    			        $sql .= ",".$tmpkey;
     			    }
     			}
 			}
 			$sql .= ") VALUES (".$this->id;
 
-			foreach($new_array_options as $key => $value)
+			foreach ($new_array_options as $key => $value)
 			{
-				$attributeKey = substr($key, 8);   // Remove 'options_' prefix
+				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribute
 				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator)
 				{
 					if ($new_array_options[$key] != '')
 					{
-						$sql.=",'".$this->db->escape($new_array_options[$key])."'";
+						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
 					}
 					else
 					{
-						$sql.=",null";
+						$sql .= ",null";
 					}
 				}
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
-			    foreach($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+			    foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
     			{
-    			    if (! isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
     			    {
-                        if (in_array($tmpval, array('int', 'double'))) $sql.=", 0";
-                        else $sql.=", ''";
+                        if (in_array($tmpval, array('int', 'double'))) $sql .= ", 0";
+                        else $sql .= ", ''";
     			    }
     			}
 			}
 
-			$sql.=")";
+			$sql .= ")";
 
 			$resql = $this->db->query($sql);
 
-			if (! $resql)
+			if (!$resql)
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$error++;
 			}
 
-			if (! $error && $trigger)
+			if (!$error && $trigger)
 			{
 				// Call trigger
-				$this->context=array('extrafieldaddupdate'=>1);
-				$result=$this->call_trigger($trigger, $userused);
+				$this->context = array('extrafieldaddupdate'=>1);
+				$result = $this->call_trigger($trigger, $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
@@ -5435,23 +5435,23 @@ abstract class CommonObject
 	 */
 	public function updateExtraField($key, $trigger = null, $userused = null)
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused=$user;
+		if (empty($userused)) $userused = $user;
 
-		$error=0;
+		$error = 0;
 
-		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0; // For avoid conflicts if trigger used
 
-		if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
+		if (!empty($this->array_options) && isset($this->array_options["options_".$key]))
 		{
 			// Check parameters
 			$langs->load('admin');
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
+			$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
 
-			$value=$this->array_options["options_".$key];
+			$value = $this->array_options["options_".$key];
 
 			$attributeType     = $extrafields->attributes[$this->table_element]['type'][$key];
 			$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$key];
@@ -5464,25 +5464,25 @@ abstract class CommonObject
 			switch ($attributeType)
 			{
 				case 'int':
-					if (!is_numeric($value) && $value!='')
+					if (!is_numeric($value) && $value != '')
 					{
-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
 					}
-					elseif ($value=='')
+					elseif ($value == '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
 					break;
 				case 'double':
 					$value = price2num($value);
-					if (!is_numeric($value) && $value!='')
+					if (!is_numeric($value) && $value != '')
 					{
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
-						$this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
 					}
-					elseif ($value=='')
+					elseif ($value == '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5499,13 +5499,13 @@ abstract class CommonObject
 					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
 					break;
 				case 'date':
-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
 					break;
 				case 'datetime':
-					$this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
+					$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
 					break;
 				case 'link':
-					$param_list=array_keys($attributeParam['options']);
+					$param_list = array_keys($attributeParam['options']);
 					// 0 : ObjectName
 					// 1 : classPath
 					$InfoFieldList = explode(":", $param_list[0]);
@@ -5514,7 +5514,7 @@ abstract class CommonObject
 					{
 						$object = new $InfoFieldList[0]($this->db);
 						$object->fetch(0, $value);
-						$this->array_options["options_".$key]=$object->id;
+						$this->array_options["options_".$key] = $object->id;
 					}
 					break;
 			}
@@ -5523,24 +5523,24 @@ abstract class CommonObject
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
 			$sql .= " WHERE fk_object = ".$this->id;
 			$resql = $this->db->query($sql);
-			if (! $resql)
+			if (!$resql)
 			{
 				$error++;
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 			}
 
-			if (! $error && $trigger)
+			if (!$error && $trigger)
 			{
 				// Call trigger
-				$this->context=array('extrafieldupdate'=>1);
-				$result=$this->call_trigger($trigger, $userused);
+				$this->context = array('extrafieldupdate'=>1);
+				$result = $this->call_trigger($trigger, $userused);
 				if ($result < 0) $error++;
 				// End call trigger
 			}
 
 			if ($error)
 			{
-				dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR);
+				dol_syslog(get_class($this)."::".__METHOD__.$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
@@ -5569,73 +5569,73 @@ abstract class CommonObject
 	 */
 	public function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0)
 	{
-		global $conf,$langs,$form;
+		global $conf, $langs, $form;
 
-		if (! is_object($form))
+		if (!is_object($form))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
+			$form = new Form($this->db);
 		}
 
-		$val=$this->fields[$key];
+		$val = $this->fields[$key];
 
-		$out='';
-        $type='';
+		$out = '';
+        $type = '';
         $param = array();
-        $param['options']=array();
-        $reg=array();
+        $param['options'] = array();
+        $reg = array();
         $size = $this->fields[$key]['size'];
         // Because we work on extrafields
-        if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)){
-        	$param['options']=array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
-        	$type ='link';
-        } elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)){
-        	$param['options']=array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');
-        	$type ='link';
-        } elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)){
-            $param['options']=array($reg[2].':'.$reg[3] => 'N');
-            $type ='link';
-        } elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options']=array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
-            $type ='sellist';
-        } elseif(preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
-            $param['options']=array();
-            $type ='varchar';
-            $size=$reg[1];
-        } elseif(preg_match('/varchar/', $val['type'])) {
-            $param['options']=array();
-            $type ='varchar';
-        } elseif(is_array($this->fields[$key]['arrayofkeyval'])) {
-            $param['options']=$this->fields[$key]['arrayofkeyval'];
-            $type ='select';
+        if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+        	$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
+        	$type = 'link';
+        } elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+        	$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+        	$type = 'link';
+        } elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[2].':'.$reg[3] => 'N');
+            $type = 'link';
+        } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+            $type = 'sellist';
+        } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
+            $param['options'] = array();
+            $type = 'varchar';
+            $size = $reg[1];
+        } elseif (preg_match('/varchar/', $val['type'])) {
+            $param['options'] = array();
+            $type = 'varchar';
+        } elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
+            $param['options'] = $this->fields[$key]['arrayofkeyval'];
+            $type = 'select';
         } else {
-            $param['options']=array();
-            $type =$this->fields[$key]['type'];
+            $param['options'] = array();
+            $type = $this->fields[$key]['type'];
         }
 
-		$label=$this->fields[$key]['label'];
+		$label = $this->fields[$key]['label'];
 		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used
-		$default=$this->fields[$key]['default'];
-		$computed=$this->fields[$key]['computed'];
-		$unique=$this->fields[$key]['unique'];
-		$required=$this->fields[$key]['required'];
+		$default = $this->fields[$key]['default'];
+		$computed = $this->fields[$key]['computed'];
+		$unique = $this->fields[$key]['unique'];
+		$required = $this->fields[$key]['required'];
 
-		$langfile=$this->fields[$key]['langfile'];
-		$list=$this->fields[$key]['list'];
-		$hidden=(in_array(abs($this->fields[$key]['visible']), array(0,2)) ? 1 : 0);
+		$langfile = $this->fields[$key]['langfile'];
+		$list = $this->fields[$key]['list'];
+		$hidden = (in_array(abs($this->fields[$key]['visible']), array(0, 2)) ? 1 : 0);
 
 		$objectid = $this->id;
 
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
 			else return '';
 		}
 
 
 		// Set value of $morecss. For this, we use in priority showsize from parameters, then $val['css'] then autodefine
-		if (empty($morecss) && ! empty($val['css']))
+		if (empty($morecss) && !empty($val['css']))
 		{
 		    $morecss = $val['css'];
 		}
@@ -5649,15 +5649,15 @@ abstract class CommonObject
 			{
 				$morecss = 'minwidth200imp';
 			}
-			elseif (in_array($type, array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+			elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 			{
 				$morecss = 'maxwidth75';
 			} elseif ($type == 'url') {
-				$morecss='minwidth400';
+				$morecss = 'minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$morecss='';
+				$morecss = '';
 			}
 			else
 			{
@@ -5676,10 +5676,10 @@ abstract class CommonObject
 			}
 		}
 
-		if (in_array($type, array('date','datetime')))
+		if (in_array($type, array('date', 'datetime')))
 		{
-			$tmp=explode(',', $size);
-			$newsize=$tmp[0];
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
 
 			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
@@ -5689,193 +5689,193 @@ abstract class CommonObject
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
 		}
-		elseif (in_array($type, array('int','integer')))
+		elseif (in_array($type, array('int', 'integer')))
 		{
-			$tmp=explode(',', $size);
-			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (in_array($type, array('real')))
 		{
-		    $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+		    $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (preg_match('/varchar/', $type))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, ! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked value="1" ';
+				$checked = ' checked value="1" ';
 			} else {
-				$checked=' value="1" ';
+				$checked = ' value="1" ';
 			}
-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
 		}
 		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		}
 		elseif ($type == 'select')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-                if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0">&nbsp;</option>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
+                if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
 				list($val, $parent) = explode('|', $val);
-				$out.='<option value="'.$key.'"';
-				$out.= (((string) $value == (string) $key)?' selected':'');
-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>'.$val.'</option>';
+				$out .= '<option value="'.$key.'"';
+				$out .= (((string) $value == (string) $key) ? ' selected' : '');
+				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+				$out .= '>'.$val.'</option>';
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'sellist')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
 			if (is_array($param['options']))
 			{
-				$param_list=array_keys($param['options']);
+				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
 				{
 					if (strpos($InfoFieldList[4], 'extra.') !== false)
 					{
-						$keyList='main.'.$InfoFieldList[2].' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList=$InfoFieldList[2].' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
 				{
 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList.= ', '.$parentField;
+					$keyList .= ', '.$parentField;
 				}
 
 				$fields_label = explode('|', $InfoFieldList[1]);
 				if (is_array($fields_label))
 				{
-					$keyList .=', ';
+					$keyList .= ', ';
 					$keyList .= implode(', ', $fields_label);
 				}
 
-				$sqlwhere='';
+				$sqlwhere = '';
 				$sql = 'SELECT '.$keyList;
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 				if (!empty($InfoFieldList[4]))
 				{
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$', $objectid, $InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 					} else {
-						$InfoFieldList[4]=str_replace('$ID$', '0', $InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra')!==false)
+					if (strpos($InfoFieldList[4], 'extra') !== false)
 					{
-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					}
 					else
 					{
-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				}
 				else
 				{
-					$sqlwhere.= ' WHERE 1=1';
+					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
 				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere.= ' AND entity = '.$conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
-				$sql.=$sqlwhere;
+				$sql .= $sqlwhere;
 				//print $sql;
 
-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+				$sql .= ' ORDER BY '.implode(', ', $fields_label);
 
 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$out.='<option value="0">&nbsp;</option>';
+					$out .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 					while ($i < $num)
 					{
-						$labeltoshow='';
+						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
 						// Several field into label (eq table:code|libelle:rowid)
@@ -5886,44 +5886,44 @@ abstract class CommonObject
 							$notrans = true;
 							foreach ($fields_label as $field_toshow)
 							{
-								$labeltoshow.= $obj->$field_toshow.' ';
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						}
 						else
 						{
-							$labeltoshow=$obj->{$InfoFieldList[1]};
+							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
-						$labeltoshow=dol_trunc($labeltoshow, 45);
+						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if ($value == $obj->rowid)
 						{
 							foreach ($fields_label as $field_toshow)
 							{
-								$translabel=$langs->trans($obj->$field_toshow);
-								if ($translabel!=$obj->$field_toshow) {
-									$labeltoshow=dol_trunc($translabel, 18).' ';
-								}else {
-									$labeltoshow=dol_trunc($obj->$field_toshow, 18).' ';
+								$translabel = $langs->trans($obj->$field_toshow);
+								if ($translabel != $obj->$field_toshow) {
+									$labeltoshow = dol_trunc($translabel, 18).' ';
+								} else {
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
 						else
 						{
-							if (! $notrans)
+							if (!$notrans)
 							{
-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel!=$obj->{$InfoFieldList[1]}) {
-									$labeltoshow=dol_trunc($translabel, 18);
+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+								if ($translabel != $obj->{$InfoFieldList[1]}) {
+									$labeltoshow = dol_trunc($translabel, 18);
 								}
 								else {
-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]}, 18);
+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
-							if ($value==$obj->rowid)
+							if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+							if ($value == $obj->rowid)
 							{
-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 
 							if (!empty($InfoFieldList[3]) && $parentField)
@@ -5931,10 +5931,10 @@ abstract class CommonObject
 								$parent = $parentName.':'.$obj->{$parentField};
 							}
 
-							$out.='<option value="'.$obj->rowid.'"';
-							$out.= ($value==$obj->rowid?' selected':'');
-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-							$out.='>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'"';
+							$out .= ($value == $obj->rowid ? ' selected' : '');
+							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 
 						$i++;
@@ -5945,23 +5945,23 @@ abstract class CommonObject
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',', $value);
-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+			$value_arr = explode(',', $value);
+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
 		}
 		elseif ($type == 'radio')
 		{
-			$out='';
+			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
 			{
-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out.= ($value==$keyopt?'checked':'');
-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
+				$out .= ' value="'.$keyopt.'"';
+				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
+				$out .= ($value == $keyopt ? 'checked' : '');
+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
 		}
 		elseif ($type == 'chkbxlst')
@@ -5976,24 +5976,24 @@ abstract class CommonObject
 			if (is_array($param['options'])) {
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', ' . $parentField;
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+					$keyList .= ', '.$parentField;
 				}
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
 					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList = $InfoFieldList[2] . ' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
 
@@ -6004,49 +6004,49 @@ abstract class CommonObject
 				}
 
 				$sqlwhere = '';
-				$sql = 'SELECT ' . $keyList;
-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-				if (! empty($InfoFieldList[4])) {
+				$sql = 'SELECT '.$keyList;
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+				if (!empty($InfoFieldList[4])) {
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$', $objectid, $InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 					} else {
-						$InfoFieldList[4]=str_replace('$ID$', '0', $InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 
 					// We have to join on extrafield table
 					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					} else {
-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array ('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere .= ' AND entity = ' . $conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
 				// print $sql;
 
 				$sql .= $sqlwhere;
-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst', LOG_DEBUG);
+				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 
-					$data=array();
+					$data = array();
 
-					while ( $i < $num ) {
+					while ($i < $num) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
@@ -6056,7 +6056,7 @@ abstract class CommonObject
 						if (is_array($fields_label)) {
 							$notrans = true;
 							foreach ($fields_label as $field_toshow) {
-								$labeltoshow .= $obj->$field_toshow . ' ';
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						} else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
@@ -6067,15 +6067,15 @@ abstract class CommonObject
 							foreach ($fields_label as $field_toshow) {
 								$translabel = $langs->trans($obj->$field_toshow);
 								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18) . ' ';
+									$labeltoshow = dol_trunc($translabel, 18).' ';
 								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
 
-							$data[$obj->rowid]=$labeltoshow;
+							$data[$obj->rowid] = $labeltoshow;
 						} else {
-							if (! $notrans) {
+							if (!$notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
@@ -6173,7 +6173,7 @@ abstract class CommonObject
 			}
 		}
 		if (!empty($hidden)) {
-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
+			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
 		}
 		/* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
@@ -6197,12 +6197,12 @@ abstract class CommonObject
 	 */
 	public function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '')
 	{
-		global $conf,$langs,$form;
+		global $conf, $langs, $form;
 
-		if (! is_object($form))
+		if (!is_object($form))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
+			$form = new Form($this->db);
 		}
 
 		$objectid = $this->id;
@@ -6214,36 +6214,36 @@ abstract class CommonObject
 		// Convert var to be able to share same code than showOutputField of extrafields
 		if (preg_match('/varchar\((\d+)\)/', $type, $reg))
 		{
-			$type = 'varchar';		// convert varchar(xx) int varchar
+			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
 		}
-		elseif (preg_match('/varchar/', $type)) $type = 'varchar';		// convert varchar(xx) int varchar
-		if (is_array($val['arrayofkeyval'])) $type='select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
+		elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
+		if (is_array($val['arrayofkeyval'])) $type = 'select';
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
 
-		$default=$val['default'];
-		$computed=$val['computed'];
-		$unique=$val['unique'];
-		$required=$val['required'];
-		$param=array();
-		$param['options']=array();
+		$default = $val['default'];
+		$computed = $val['computed'];
+		$unique = $val['unique'];
+		$required = $val['required'];
+		$param = array();
+		$param['options'] = array();
 
 		if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg))
 		{
-			$type='link';
-			$param['options']=array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
+			$type = 'link';
+			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
 		}
-        elseif(preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options'] = array($reg[1] . ':' . $reg[2] . ':' . $reg[3] . ':' . $reg[4] => 'N');
+        elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
             $type = 'sellist';
         }
 
 
-		$langfile=$val['langfile'];
-		$list=$val['list'];
-		$help=$val['help'];
-		$hidden=(($val['visible'] == 0) ? 1 : 0);			// If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+		$langfile = $val['langfile'];
+		$list = $val['list'];
+		$help = $val['help'];
+		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
 		if ($hidden) return '';
 
@@ -6265,17 +6265,17 @@ abstract class CommonObject
 			{
 				$morecss = 'minwidth200imp';
 			}
-			elseif (in_array($type, array('int','double','price')))
+			elseif (in_array($type, array('int', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
 			}
 			elseif ($type == 'url')
 			{
-				$morecss='minwidth400';
+				$morecss = 'minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$morecss='';
+				$morecss = '';
 			}
 			else
 			{
@@ -6295,90 +6295,90 @@ abstract class CommonObject
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3);
+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);
+		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);
 		elseif ($type == 'date')
 		{
-			if(! empty($value)) {
-				$value=dol_print_date($value, 'day');
+			if (!empty($value)) {
+				$value = dol_print_date($value, 'day');
 			} else {
-				$value='';
+				$value = '';
 			}
 		}
 		elseif ($type == 'datetime' || $type == 'timestamp')
 		{
-			if(! empty($value)) {
-				$value=dol_print_date($value, 'dayhour');
+			if (!empty($value)) {
+				$value = dol_print_date($value, 'dayhour');
 			} else {
-				$value='';
+				$value = '';
 			}
 		}
 		elseif ($type == 'double' || $type == 'real')
 		{
 			if (!empty($value)) {
-				$value=price($value);
+				$value = price($value);
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked ';
+				$checked = ' checked ';
 			}
-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
+			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
 		}
 		elseif ($type == 'mail')
 		{
-			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
+			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
 		}
 		elseif ($type == 'url')
 		{
-			$value=dol_print_url($value, '_blank', 32, 1);
+			$value = dol_print_url($value, '_blank', 32, 1);
 		}
 		elseif ($type == 'phone')
 		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
 		}
 		elseif ($type == 'price')
 		{
-			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
+			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 		}
 		elseif ($type == 'select')
 		{
-			$value=$param['options'][$value];
+			$value = $param['options'][$value];
 		}
 		elseif ($type == 'sellist')
 		{
-			$param_list=array_keys($param['options']);
+			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
 
-			$selectkey="rowid";
-			$keyList='rowid';
+			$selectkey = "rowid";
+			$keyList = 'rowid';
 
-			if (count($InfoFieldList)>=3)
+			if (count($InfoFieldList) >= 3)
 			{
 				$selectkey = $InfoFieldList[2];
-				$keyList=$InfoFieldList[2].' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
 			$fields_label = explode('|', $InfoFieldList[1]);
-			if(is_array($fields_label)) {
-				$keyList .=', ';
+			if (is_array($fields_label)) {
+				$keyList .= ', ';
 				$keyList .= implode(', ', $fields_label);
 			}
 
 			$sql = 'SELECT '.$keyList;
-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra')!==false)
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+			if (strpos($InfoFieldList[4], 'extra') !== false)
 			{
-				$sql.= ' as main';
+				$sql .= ' as main';
 			}
-			if ($selectkey=='rowid' && empty($value)) {
-				$sql.= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey=='rowid') {
-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+			if ($selectkey == 'rowid' && empty($value)) {
+				$sql .= " WHERE ".$selectkey."=0";
+			} elseif ($selectkey == 'rowid') {
+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
+			} else {
+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
 			//$sql.= ' AND entity = '.$conf->entity;
@@ -6387,38 +6387,38 @@ abstract class CommonObject
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$value='';	// value was used, so now we reste it to use it to build final output
+				$value = ''; // value was used, so now we reste it to use it to build final output
 
 				$obj = $this->db->fetch_object($resql);
 
 				// Several field into label (eq table:code|libelle:rowid)
 				$fields_label = explode('|', $InfoFieldList[1]);
 
-				if(is_array($fields_label) && count($fields_label)>1)
+				if (is_array($fields_label) && count($fields_label) > 1)
 				{
 					foreach ($fields_label as $field_toshow)
 					{
-						$translabel='';
+						$translabel = '';
 						if (!empty($obj->$field_toshow)) {
-							$translabel=$langs->trans($obj->$field_toshow);
+							$translabel = $langs->trans($obj->$field_toshow);
 						}
-						if ($translabel!=$field_toshow) {
-							$value.=dol_trunc($translabel, 18).' ';
-						}else {
-							$value.=$obj->$field_toshow.' ';
+						if ($translabel != $field_toshow) {
+							$value .= dol_trunc($translabel, 18).' ';
+						} else {
+							$value .= $obj->$field_toshow.' ';
 						}
 					}
 				}
 				else
 				{
-					$translabel='';
+					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 					}
-					if ($translabel!=$obj->{$InfoFieldList[1]}) {
-						$value=dol_trunc($translabel, 18);
-					}else {
-						$value=$obj->{$InfoFieldList[1]};
+					if ($translabel != $obj->{$InfoFieldList[1]}) {
+						$value = dol_trunc($translabel, 18);
+					} else {
+						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
 			}
@@ -6426,19 +6426,19 @@ abstract class CommonObject
 		}
 		elseif ($type == 'radio')
 		{
-			$value=$param['options'][$value];
+			$value = $param['options'][$value];
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',', $value);
-			$value='';
-			if (is_array($value_arr) && count($value_arr)>0)
+			$value_arr = explode(',', $value);
+			$value = '';
+			if (is_array($value_arr) && count($value_arr) > 0)
 			{
-				$toprint=array();
+				$toprint = array();
 				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
 				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
 		}
 		elseif ($type == 'chkbxlst')
@@ -6453,7 +6453,7 @@ abstract class CommonObject
 
 			if (count($InfoFieldList) >= 3) {
 				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2] . ' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
 			$fields_label = explode('|', $InfoFieldList[1]);
@@ -6462,74 +6462,74 @@ abstract class CommonObject
 				$keyList .= implode(', ', $fields_label);
 			}
 
-			$sql = 'SELECT ' . $keyList;
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+			$sql = 'SELECT '.$keyList;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
 			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			// $sql.= ' AND entity = '.$conf->entity;
 
-			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst', LOG_DEBUG);
+			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint=array();
-				while ( $obj = $this->db->fetch_object($resql) ) {
+				$toprint = array();
+				while ($obj = $this->db->fetch_object($resql)) {
 					// Several field into label (eq table:code|libelle:rowid)
 					$fields_label = explode('|', $InfoFieldList[1]);
 					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 						if (is_array($fields_label) && count($fields_label) > 1) {
 							foreach ($fields_label as $field_toshow) {
 								$translabel = '';
-								if (! empty($obj->$field_toshow)) {
+								if (!empty($obj->$field_toshow)) {
 									$translabel = $langs->trans($obj->$field_toshow);
 								}
 								if ($translabel != $field_toshow) {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
 								}
 							}
 						} else {
 							$translabel = '';
-							if (! empty($obj->{$InfoFieldList[1]})) {
+							if (!empty($obj->{$InfoFieldList[1]})) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 							}
 							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 							} else {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
 							}
 						}
 					}
 				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			} else {
-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$out='';
+			$out = '';
 
 			// only if something to display (perf)
 			if ($value)
 			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
-				$classname=$InfoFieldList[0];
-				$classpath=$InfoFieldList[1];
-				$getnomurlparam=(empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);
-				if (! empty($classpath))
+				$classname = $InfoFieldList[0];
+				$classpath = $InfoFieldList[1];
+				$getnomurlparam = (empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);
+				if (!empty($classpath))
 				{
 					dol_include_once($InfoFieldList[1]);
 					if ($classname && class_exists($classname))
 					{
 						$object = new $classname($this->db);
 						$object->fetch($value);
-						$value=$object->getNomUrl($getnomurlparam);
+						$value = $object->getNomUrl($getnomurlparam);
 					}
 				}
 				else
@@ -6538,15 +6538,15 @@ abstract class CommonObject
 					return 'Error bad setup of extrafield';
 				}
 			}
-			else $value='';
+			else $value = '';
 		}
 		elseif ($type == 'text' || $type == 'html')
 		{
-			$value=dol_htmlentitiesbr($value);
+			$value = dol_htmlentitiesbr($value);
 		}
 		elseif ($type == 'password')
 		{
-			$value=preg_replace('/./i', '*', $value);
+			$value = preg_replace('/./i', '*', $value);
 		}
 		elseif ($type == 'array')
 		{
@@ -6554,7 +6554,7 @@ abstract class CommonObject
 		}
 
 		//print $type.'-'.$size;
-		$out=$value;
+		$out = $value;
 
 		return $out;
 	}
@@ -6575,7 +6575,7 @@ abstract class CommonObject
 	{
 		global $db, $conf, $langs, $action, $form;
 
-		if (! is_object($form)) $form=new Form($db);
+		if (!is_object($form)) $form = new Form($db);
 
 		$out = '';
 
@@ -6587,7 +6587,7 @@ abstract class CommonObject
 
             $extrafields_collapse_num = '';
 			$e = 0;
-			foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
+			foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 			{
 				// Show only the key field in params
 				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
@@ -6607,26 +6607,26 @@ abstract class CommonObject
 					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
 				}
 
-				if (($mode == 'create' || $mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-				elseif($mode == 'view' && empty($visibility)) continue;
+				if (($mode == 'create' || $mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+				elseif ($mode == 'view' && empty($visibility)) continue;
 				if (empty($perms)) continue;
 
 				// Load language if required
-				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
 
-				$colspan='3';
-				if (is_array($params) && count($params)>0) {
+				$colspan = '3';
+				if (is_array($params) && count($params) > 0) {
 					if (array_key_exists('colspan', $params)) {
-						$colspan=$params['colspan'];
+						$colspan = $params['colspan'];
 					}
 				}
 
-				switch($mode) {
+				switch ($mode) {
 					case "view":
-						$value=$this->array_options["options_".$key.$keysuffix];
+						$value = $this->array_options["options_".$key.$keysuffix];
 						break;
 					case "edit":
-						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none');				// GETPOST can get value from GET, POST or setup of default values.
+						$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none'); // GETPOST can get value from GET, POST or setup of default values.
 						// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
 						if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))
 						{
@@ -6637,7 +6637,7 @@ abstract class CommonObject
 								$value = $getposttemp;
 							}
 						} else {
-							$value = $this->array_options["options_" . $key];			// No GET, no POST, no default value, so we take value of object.
+							$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.
 						}
 						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
 						break;
@@ -6650,10 +6650,10 @@ abstract class CommonObject
                     if (!empty($extrafield_param) && is_array($extrafield_param)) {
                         $extrafield_param_list = array_keys($extrafield_param['options']);
 
-                        if (count($extrafield_param_list)>0) {
+                        if (count($extrafield_param_list) > 0) {
                             $extrafield_collapse_display_value = intval($extrafield_param_list[0]);
 
-                            if ($extrafield_collapse_display_value==1 || $extrafield_collapse_display_value==2) {
+                            if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
                                 $extrafields_collapse_num = $extrafields->attributes[$this->table_element]['pos'][$key];
                             }
                         }
@@ -6663,14 +6663,14 @@ abstract class CommonObject
 				}
 				else
 				{
-					$class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
-					$csstyle='';
-					if (is_array($params) && count($params)>0) {
+					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
+					$csstyle = '';
+					if (is_array($params) && count($params) > 0) {
 						if (array_key_exists('class', $params)) {
-							$class.=$params['class'].' ';
+							$class .= $params['class'].' ';
 						}
 						if (array_key_exists('style', $params)) {
-							$csstyle=$params['style'];
+							$csstyle = $params['style'];
 						}
 					}
 
@@ -6683,24 +6683,24 @@ abstract class CommonObject
 
 					$out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan='0'; }
+					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan = '0'; }
 
 					if ($action == 'selectlines') { $colspan++; }
 
 					// Convert date into timestamp format (value in memory must be a timestamp)
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date','datetime')))
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
 					{
-						$datenotinstring = $this->array_options['options_' . $key];
-						if (! is_numeric($this->array_options['options_' . $key]))	// For backward compatibility
+						$datenotinstring = $this->array_options['options_'.$key];
+						if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility
 						{
 							$datenotinstring = $this->db->jdate($datenotinstring);
 						}
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)):$datenotinstring;
+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
 					}
 					// Convert float submited string into real php numeric (value in memory must be a php numeric)
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price','double')))
+					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double')))
 					{
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)):$this->array_options['options_'.$key];
+						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];
 					}
 
 					$labeltoshow = $langs->trans($label);
@@ -6710,25 +6710,25 @@ abstract class CommonObject
 					//if (GETPOST('action', 'none') == 'create') $out.='create';
 					// BUG #11554 : For public page, use red dot for required fields, instead of bold label
 					$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
-					if ($tpl_context=="public") {	// Public page : red dot instead of fieldrequired characters
+					if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters
 						$out .= '">';
-						if (! empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
+						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
 						else $out .= $labeltoshow;
-						if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
+						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
 					} else {
-						if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
 						$out .= '">';
-						if (! empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
+						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
 						else $out .= $labeltoshow;
 					}
 					$out .= '</td>';
 
 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
 
-					$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan?' colspan="'.$colspan.'"':'').'>';
+					$out .= '<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 					//$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'">';
 
-					switch($mode) {
+					switch ($mode) {
 						case "view":
 							$out .= $extrafields->showOutputField($key, $value);
 							break;
@@ -6744,14 +6744,14 @@ abstract class CommonObject
 						$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';
 					}*/
 
-					if (! empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
+					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
 					else $out .= '</tr>';
 					$e++;
 				}
 			}
 			$out .= "\n";
 			// Add code to manage list depending on others
-			if (! empty($conf->use_javascript_ajax)) {
+			if (!empty($conf->use_javascript_ajax)) {
 				$out .= '
 				<script>
 				    jQuery(document).ready(function() {
@@ -6797,7 +6797,7 @@ abstract class CommonObject
 		global $user;
 
 		$element = $this->element;
-		if ($element == 'facturerec') $element='facture';
+		if ($element == 'facturerec') $element = 'facture';
 
 		return $user->rights->{$element};
 	}
@@ -6820,9 +6820,9 @@ abstract class CommonObject
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;
 
-			if (! $db->query($sql))
+			if (!$db->query($sql))
 			{
-				if ($ignoreerrors) return true;		// TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 				//$this->errors = $db->lasterror();
 				return false;
 			}
@@ -6856,7 +6856,7 @@ abstract class CommonObject
 		else
 		{
 			// Get cost price for margin calculation
-			if (! empty($fk_product))
+			if (!empty($fk_product))
 			{
 				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice')
 				{
@@ -6893,7 +6893,7 @@ abstract class CommonObject
 					}
 				}
 
-				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1','pmp','costprice')))
+				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice')))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 					$productFournisseur = new ProductFournisseur($this->db);
@@ -6933,25 +6933,25 @@ abstract class CommonObject
 	public function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0)
 	{
         // phpcs:enable
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
-		include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-		include_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-		$sortfield='position_name';
-		$sortorder='asc';
+		$sortfield = 'position_name';
+		$sortorder = 'asc';
 
-		$dir = $sdir . '/';
+		$dir = $sdir.'/';
 		$pdir = '/';
 
 		$dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
 		$pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
 
 		// For backward compatibility
-		if ($modulepart == 'product' && ! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
+		if ($modulepart == 'product' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 		{
-			$dir = $sdir . '/'. get_exdir($this->id, 2, 0, 0, $this, $modulepart) . $this->id ."/photos/";
-			$pdir = '/' . get_exdir($this->id, 2, 0, 0, $this, $modulepart) . $this->id ."/photos/";
+			$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+			$pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
 		}
 
 		// Defined relative dir to DOL_DATA_ROOT
@@ -6966,10 +6966,10 @@ abstract class CommonObject
 		$dirthumb = $dir.'thumbs/';
 		$pdirthumb = $pdir.'thumbs/';
 
-		$return ='<!-- Photo -->'."\n";
-		$nbphoto=0;
+		$return = '<!-- Photo -->'."\n";
+		$nbphoto = 0;
 
-		$filearray=dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
+		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 
 		/*if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 		 {
@@ -6983,12 +6983,12 @@ abstract class CommonObject
 		{
 			if ($sortfield && $sortorder)
 			{
-				$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
+				$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
 			}
 
-			foreach($filearray as $key => $val)
+			foreach ($filearray as $key => $val)
 			{
-				$photo='';
+				$photo = '';
 				$file = $val['name'];
 
 				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
@@ -7002,36 +7002,36 @@ abstract class CommonObject
 
 					if ($size == 1 || $size == 'small') {   // Format vignette
 						// Find name of thumb file
-						$photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette='';
+						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
+						if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';
 
 						// Get filesize of original file
-						$imgarray=dol_getImageSize($dir.$photo);
+						$imgarray = dol_getImageSize($dir.$photo);
 
 						if ($nbbyrow > 0)
 						{
-							if ($nbphoto == 1) $return.= '<table class="valigntop center centpercent" style="border: 0; padding: 2; border-spacing: 2px; border-collapse: separate;">';
+							if ($nbphoto == 1) $return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2; border-spacing: 2px; border-collapse: separate;">';
 
-							if ($nbphoto % $nbbyrow == 1) $return.= '<tr class="center valignmiddle" style="border: 1px">';
-							$return.= '<td style="width: '.ceil(100/$nbbyrow).'%" class="photo">';
+							if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';
+							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';
 						}
 						elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
-						$return.= "\n";
+						$return .= "\n";
 
-						$relativefile=preg_replace('/^\//', '', $pdir.$photo);
+						$relativefile = preg_replace('/^\//', '', $pdir.$photo);
 						if (empty($nolink))
 						{
-							$urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return.='<a href="'.$urladvanced.'">';
-							else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							$urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
+							if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';
+							else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
 						}
 
 						// Show image (width height=$maxHeight)
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
-						$alt=$langs->transnoentitiesnoconv('File').': '.$relativefile;
-						$alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt='';
+						$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;
+						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
+						if ($notitle) $alt = '';
 
 						if ($usesharelink)
 						{
@@ -7039,81 +7039,81 @@ abstract class CommonObject
 							{
 								if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 								{
-									$return.= '<!-- Show original file (thumb not yet available with shared links) -->';
-									$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';
+									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
 								else {
-									$return.= '<!-- Show original file -->';
-									$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
+									$return .= '<!-- Show original file -->';
+									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
 							}
 							else
 							{
-								$return.= '<!-- Show nophoto file (because file is not shared) -->';
-								$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<!-- Show nophoto file (because file is not shared) -->';
+								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 						else
 						{
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
-								$return.= '<!-- Show thumb -->';
-								$return.= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<!-- Show thumb -->';
+								$return .= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 							else {
-								$return.= '<!-- Show original file -->';
-								$return.= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<!-- Show original file -->';
+								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
 						}
 
-						if (empty($nolink)) $return.= '</a>';
-						$return.="\n";
+						if (empty($nolink)) $return .= '</a>';
+						$return .= "\n";
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) $return .= '<br>'.$viewfilename;
 						if ($showaction)
 						{
-							$return.= '<br>';
+							$return .= '<br>';
 							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
 							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))
 							{
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
 							}
 							// Special cas for product
 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
 							{
 								// Link to resize
-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-								$return.= img_delete().'</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= img_delete().'</a>';
 							}
 						}
-						$return.= "\n";
+						$return .= "\n";
 
 						if ($nbbyrow > 0)
 						{
-							$return.= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>';
+							$return .= '</td>';
+							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
 						}
-						elseif ($nbbyrow < 0) $return.='</div>';
+						elseif ($nbbyrow < 0) $return .= '</div>';
 					}
 
 					if (empty($size)) {     // Format origine
-						$return.= '<img class="photo photowithmargin" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
+						$return .= '<img class="photo photowithmargin" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-						if ($showfilename) $return.= '<br>'.$viewfilename;
+						if ($showfilename) $return .= '<br>'.$viewfilename;
 						if ($showaction)
 						{
 							// Special case for product
 							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
 							{
 								// Link to resize
-								$return.= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
+								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return.= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
-								$return.= img_delete().'</a>';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= img_delete().'</a>';
 							}
 						}
 					}
@@ -7123,18 +7123,18 @@ abstract class CommonObject
 				}
 			}
 
-			if ($size==1 || $size=='small')
+			if ($size == 1 || $size == 'small')
 			{
 				if ($nbbyrow > 0)
 				{
 					// Ferme tableau
 					while ($nbphoto % $nbbyrow)
 					{
-						$return.= '<td style="width: '.ceil(100/$nbbyrow).'%">&nbsp;</td>';
+						$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
 						$nbphoto++;
 					}
 
-					if ($nbphoto) $return.= '</table>';
+					if ($nbphoto) $return .= '</table>';
 				}
 			}
 		}
@@ -7181,7 +7181,7 @@ abstract class CommonObject
 	 */
 	public function isInt($info)
 	{
-		if(is_array($info))
+		if (is_array($info))
 		{
 			if (isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i', $info['type']))) return true;
 			else return false;
@@ -7281,13 +7281,13 @@ abstract class CommonObject
 	{
 		global $conf;
 
-		$queryarray=array();
+		$queryarray = array();
 		foreach ($this->fields as $field=>$info)	// Loop on definition of fields
 		{
 			// Depending on field type ('datetime', ...)
-			if($this->isDate($info))
+			if ($this->isDate($info))
 			{
-				if(empty($this->{$field}))
+				if (empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
 				}
@@ -7296,10 +7296,10 @@ abstract class CommonObject
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
 			}
-			elseif($this->isArray($info))
+			elseif ($this->isArray($info))
 			{
-				if(! empty($this->{$field})) {
-					if(! is_array($this->{$field})) {
+				if (!empty($this->{$field})) {
+					if (!is_array($this->{$field})) {
 						$this->{$field} = array($this->{$field});
 					}
 					$queryarray[$field] = serialize($this->{$field});
@@ -7327,7 +7327,7 @@ abstract class CommonObject
 			}
 
 			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
 		}
 
 		return $queryarray;
@@ -7343,22 +7343,22 @@ abstract class CommonObject
 	{
 		foreach ($this->fields as $field => $info)
 		{
-			if($this->isDate($info))
+			if ($this->isDate($info))
 			{
-				if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
+				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
 			}
-			elseif($this->isArray($info))
+			elseif ($this->isArray($info))
 			{
-				if(! empty($obj->{$field})) {
+				if (!empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
 					// Hack for data not in UTF8
-					if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+					if ($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
 				} else {
 					$this->{$field} = array();
 				}
 			}
-			elseif($this->isInt($info))
+			elseif ($this->isInt($info))
 			{
 				if ($field == 'rowid') $this->id = (int) $obj->{$field};
 				else
@@ -7374,7 +7374,7 @@ abstract class CommonObject
 					}
 				}
 			}
-			elseif($this->isFloat($info))
+			elseif ($this->isFloat($info))
 			{
 				if ($this->isForcedToNullIfZero($info))
 				{
@@ -7393,7 +7393,7 @@ abstract class CommonObject
 		}
 
 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+		if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
 	}
 
 	/**
@@ -7509,16 +7509,16 @@ abstract class CommonObject
 		}
 
 		// Create extrafields
-		if (! $error)
+		if (!$error)
 		{
-			$result=$this->insertExtraFields();
+			$result = $this->insertExtraFields();
 			if ($result < 0) $error++;
 		}
 
 		// Create lines
-		if (! empty($this->table_element_line) && ! empty($this->fk_element))
+		if (!empty($this->table_element_line) && !empty($this->fk_element))
 		{
-			$num=(is_array($this->lines) ? count($this->lines) : 0);
+			$num = (is_array($this->lines) ? count($this->lines) : 0);
 			for ($i = 0; $i < $num; $i++)
 			{
 				$line = $this->lines[$i];
@@ -7528,12 +7528,12 @@ abstract class CommonObject
 
 				// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-				if (! is_object($line)) $line = (object) $line;
+				if (!is_object($line)) $line = (object) $line;
 
 				$result = $line->create($user, 1);
 				if ($result < 0)
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
@@ -7541,10 +7541,10 @@ abstract class CommonObject
 		}
 
 		// Triggers
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call triggers
-			$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
+			$result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
 			if ($result < 0) { $error++; }
 			// End call triggers
 		}
@@ -7573,14 +7573,14 @@ abstract class CommonObject
 		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
 
 		$sql = 'SELECT '.$this->getFieldList();
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id))  $sql.= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql.=' WHERE 1 = 1';	// usage with empty id and empty ref is very rare
-		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql.=' AND entity IN ('.getEntity($this->table_element).')';
-		if ($morewhere)   $sql.= $morewhere;
-		$sql.=' LIMIT 1';	// This is a fetch, to be sure to get only one record
+		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;
+		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' AND entity IN ('.getEntity($this->table_element).')';
+		if ($morewhere)   $sql .= $morewhere;
+		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
 		if ($res)
@@ -7613,7 +7613,7 @@ abstract class CommonObject
 	public function fetchLinesCommon($morewhere = '')
 	{
 		$objectlineclassname = get_class($this).'Line';
-		if (! class_exists($objectlineclassname))
+		if (!class_exists($objectlineclassname))
 		{
 			$this->error = 'Error, class '.$objectlineclassname.' not found during call of fetchLinesCommon';
 			return -1;
@@ -7622,9 +7622,9 @@ abstract class CommonObject
 		$objectline = new $objectlineclassname($this->db);
 
 		$sql = 'SELECT '.$objectline->getFieldList();
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
-		$sql.=' WHERE fk_'.$this->element.' = '.$this->id;
-		if ($morewhere)   $sql.= $morewhere;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
+		$sql .= ' WHERE fk_'.$this->element.' = '.$this->id;
+		if ($morewhere)   $sql .= $morewhere;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -7685,10 +7685,10 @@ abstract class CommonObject
 		}
 
 		// Clean and check mandatory
-		foreach($keys as $key)
+		foreach ($keys as $key)
 		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';		// This is an implicit foreign key field
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';					// This is an explicit foreign key field
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = ''; // This is an explicit foreign key field
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			/*
@@ -7699,13 +7699,13 @@ abstract class CommonObject
 			}*/
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id ;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(',', $tmp).' WHERE rowid='.$this->id;
 
 		$this->db->begin();
-		if (! $error)
+		if (!$error)
 		{
 			$res = $this->db->query($sql);
-			if ($res===false)
+			if ($res === false)
 			{
 				$error++;
 				$this->errors[] = $this->db->lasterror();
@@ -7713,9 +7713,9 @@ abstract class CommonObject
 		}
 
 		// Update extrafield
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0)
+		if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options) > 0)
 		{
-			$result=$this->insertExtraFields();
+			$result = $this->insertExtraFields();
 			if ($result < 0)
 			{
 				$error++;
@@ -7723,10 +7723,10 @@ abstract class CommonObject
 		}
 
 		// Triggers
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
 			// Call triggers
-			$result=$this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
+			$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
 			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
 			// End call triggers
 		}
@@ -7751,82 +7751,82 @@ abstract class CommonObject
 	 */
 	public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		if ($forcechilddeletion)	// Force also delete of childtables that should lock deletion in standard case when option force is off
 		{
-			foreach($this->childtables as $table)
+			foreach ($this->childtables as $table)
 			{
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
 				$resql = $this->db->query($sql);
-				if (! $resql)
+				if (!$resql)
 				{
-					$this->error=$this->db->lasterror();
-					$this->errors[]=$this->error;
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->error;
 					$this->db->rollback();
 					return -1;
 				}
 			}
 		}
-		elseif (! empty($this->fk_element) && ! empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
-			if (! empty($objectisused))
+			if (!empty($objectisused))
 			{
 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
-				$this->error='ErrorRecordHasChildren';
-				$this->errors[]=$this->error;
+				$this->error = 'ErrorRecordHasChildren';
+				$this->errors[] = $this->error;
 				$this->db->rollback();
 				return 0;
 			}
 		}
 
 		// Delete cascade first
-		if (! empty($this->childtablesoncascade)) {
-            foreach($this->childtablesoncascade as $table)
+		if (!empty($this->childtablesoncascade)) {
+            foreach ($this->childtablesoncascade as $table)
             {
                 $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
                 $resql = $this->db->query($sql);
-                if (! $resql)
+                if (!$resql)
                 {
-                    $this->error=$this->db->lasterror();
-                    $this->errors[]=$this->error;
+                    $this->error = $this->db->lasterror();
+                    $this->errors[] = $this->error;
                     $this->db->rollback();
                     return -1;
                 }
             }
         }
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Call triggers
-				$result=$this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
+				$result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
 				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
 				// End call triggers
 			}
 		}
 
-		if (! $error && ! empty($this->isextrafieldmanaged))
+		if (!$error && !empty($this->isextrafieldmanaged))
 		{
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element."_extrafields";
-			$sql.= " WHERE fk_object=" . $this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element."_extrafields";
+			$sql .= " WHERE fk_object=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (! $resql)
+			if (!$resql)
 			{
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
 
 			$res = $this->db->query($sql);
-			if($res===false) {
+			if ($res === false) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
@@ -7854,26 +7854,26 @@ abstract class CommonObject
 	{
 		global $conf;
 
-		$error=0;
+		$error = 0;
 
 		$tmpforobjectclass = get_class($this);
 		$tmpforobjectlineclass = ucfirst($tmpforobjectclass).'Line';
 
 		// Call trigger
-		$result=$this->call_trigger('LINE'.strtoupper($tmpforobjectclass).'_DELETE', $user);
+		$result = $this->call_trigger('LINE'.strtoupper($tmpforobjectclass).'_DELETE', $user);
 		if ($result < 0) return -1;
 		// End call triggers
 
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element_line;
-		$sql.= " WHERE rowid=".$idline;
+		$sql .= " WHERE rowid=".$idline;
 
 		dol_syslog(get_class($this)."::deleteLineCommon", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			$error++;
 		}
 
@@ -7882,12 +7882,12 @@ abstract class CommonObject
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
 				$tmpobjectline = new $tmpforobjectlineclass($this->db);
-				$tmpobjectline->id= $idline;
-				$result=$tmpobjectline->deleteExtraFields();
+				$tmpobjectline->id = $idline;
+				$result = $tmpobjectline->deleteExtraFields();
 				if ($result < 0)
 				{
 					$error++;
-					$this->error="Error ".get_class($this)."::deleteLineCommon deleteExtraFields error -4 ".$tmpobjectline->error;
+					$this->error = "Error ".get_class($this)."::deleteLineCommon deleteExtraFields error -4 ".$tmpobjectline->error;
 				}
 			}
 		}
@@ -7914,24 +7914,24 @@ abstract class CommonObject
 	 */
 	public function setStatusCommon($user, $status, $notrigger = 0, $triggercode = '')
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql.= " SET status = ".$status;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " SET status = ".$status;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		if ($this->db->query($sql))
 		{
-			if (! $error)
+			if (!$error)
 			{
-				$this->oldcopy= clone $this;
+				$this->oldcopy = clone $this;
 			}
 
-			if (! $error && ! $notrigger) {
+			if (!$error && !$notrigger) {
 				// Call trigger
-				$result=$this->call_trigger($triggercode, $user);
+				$result = $this->call_trigger($triggercode, $user);
 				if ($result < 0) $error++;
 			}
 
@@ -7946,7 +7946,7 @@ abstract class CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
@@ -7964,14 +7964,14 @@ abstract class CommonObject
 	    global $user;
 
 		$this->id = 0;
-		if (array_key_exists('label', $this->fields)) $this->label='This is label';
-		if (array_key_exists('note_public', $this->fields)) $this->note_public='Public note';
-		if (array_key_exists('note_private', $this->fields)) $this->note_private='Private note';
-		if (array_key_exists('date_creation', $this->fields)) $this->date_creation=(dol_now()-3600*24);
-		if (array_key_exists('date_modification', $this->fields)) $this->date_modification=(dol_now()-3600*24);
-		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat=$user->id;
-		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif=$user->id;
-		if (array_key_exists('date', $this->fields)) $this->date=dol_now();
+		if (array_key_exists('label', $this->fields)) $this->label = 'This is label';
+		if (array_key_exists('note_public', $this->fields)) $this->note_public = 'Public note';
+		if (array_key_exists('note_private', $this->fields)) $this->note_private = 'Private note';
+		if (array_key_exists('date_creation', $this->fields)) $this->date_creation = (dol_now() - 3600 * 24);
+		if (array_key_exists('date_modification', $this->fields)) $this->date_modification = (dol_now() - 3600 * 24);
+		if (array_key_exists('fk_user_creat', $this->fields)) $this->fk_user_creat = $user->id;
+		if (array_key_exists('fk_user_modif', $this->fields)) $this->fk_user_modif = $user->id;
+		if (array_key_exists('date', $this->fields)) $this->date = dol_now();
 		// ...
 	}
 
@@ -7987,9 +7987,9 @@ abstract class CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';
 
 		$comment = new Comment($this->db);
-		$result=$comment->fetchAllFor($this->element, $this->id);
-		if ($result<0) {
-			$this->errors=array_merge($this->errors, $comment->errors);
+		$result = $comment->fetchAllFor($this->element, $this->id);
+		if ($result < 0) {
+			$this->errors = array_merge($this->errors, $comment->errors);
 			return -1;
 		} else {
 			$this->comments = $comment->comments;
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index e37849ff99a..a4d7b742d51 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -35,7 +35,7 @@ class CUnits // extends CommonObject
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -82,45 +82,45 @@ class CUnits // extends CommonObject
     public function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
 		if (isset($this->id)) $this->id = (int) $this->id;
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->label)) $this->libelle=trim($this->label);
-		if (isset($this->short_label)) $this->libelle=trim($this->short_label);
-		if (isset($this->unit_type)) $this->active=trim($this->unit_type);
-		if (isset($this->active)) $this->active=trim($this->active);
-		if (isset($this->scale)) $this->scale=trim($this->scale);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->label)) $this->libelle = trim($this->label);
+		if (isset($this->short_label)) $this->libelle = trim($this->short_label);
+		if (isset($this->unit_type)) $this->active = trim($this->unit_type);
+		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->scale)) $this->scale = trim($this->scale);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_units(";
-		$sql.= "rowid,";
-		$sql.= "code,";
-		$sql.= "label,";
-		$sql.= "short_label,";
-		$sql.= "unit_type";
-		$sql.= "scale";
-        $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->id)?'NULL':"'".$this->db->escape($this->id)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
-		$sql.= " ".(! isset($this->short_label)?'NULL':"'".$this->db->escape($this->short_label)."'").",";
-		$sql.= " ".(! isset($this->unit_type)?'NULL':"'".$this->db->escape($this->unit_type)."'");
-		$sql.= " ".(! isset($this->scale)?'NULL':"'".$this->db->escape($this->scale)."'");
-		$sql.= ")";
+		$sql .= "rowid,";
+		$sql .= "code,";
+		$sql .= "label,";
+		$sql .= "short_label,";
+		$sql .= "unit_type";
+		$sql .= "scale";
+        $sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->id) ? 'NULL' : "'".$this->db->escape($this->id)."'").",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
+		$sql .= " ".(!isset($this->short_label) ? 'NULL' : "'".$this->db->escape($this->short_label)."'").",";
+		$sql .= " ".(!isset($this->unit_type) ? 'NULL' : "'".$this->db->escape($this->unit_type)."'");
+		$sql .= " ".(!isset($this->scale) ? 'NULL' : "'".$this->db->escape($this->scale)."'");
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_units");
 
@@ -141,13 +141,13 @@ class CUnits // extends CommonObject
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -171,32 +171,32 @@ class CUnits // extends CommonObject
     	global $langs;
 
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code,";
-		$sql.= " t.label,";
-		$sql.= " t.short_label,";
-		$sql.= " t.scale,";
-		$sql.= " t.unit_type,";
-		$sql.= " t.scale,";
-		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_units as t";
-        $sql_where=array();
-        if ($id)   $sql_where[]= " t.id = ".$id;
-        if ($unit_type)   $sql_where[]= " t.unit_type = '".$this->db->escape($unit_type)."'";
-        if ($code) $sql_where[]= " t.code = '".$this->db->escape($code)."'";
-        if ($short_label) $sql_where[]= " t.short_label = '".$this->db->escape($short_label)."'";
-        if (count($sql_where)>0) {
-        	$sql.=' WHERE '. implode(' AND ', $sql_where);
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.short_label,";
+		$sql .= " t.scale,";
+		$sql .= " t.unit_type,";
+		$sql .= " t.scale,";
+		$sql .= " t.active";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
+        $sql_where = array();
+        if ($id)   $sql_where[] = " t.id = ".$id;
+        if ($unit_type)   $sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";
+        if ($code) $sql_where[] = " t.code = '".$this->db->escape($code)."'";
+        if ($short_label) $sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";
+        if (count($sql_where) > 0) {
+        	$sql .= ' WHERE '.implode(' AND ', $sql_where);
         }
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
+                $this->id = $obj->rowid;
 				$this->code = $obj->code;
 				$this->label = $obj->label;
 				$this->short_label = $obj->short_label;
@@ -211,7 +211,7 @@ class CUnits // extends CommonObject
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -295,8 +295,8 @@ class CUnits // extends CommonObject
 
     		return $this->records;
     	} else {
-    		$this->errors[] = 'Error ' . $this->db->lasterror();
-    		dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+    		$this->errors[] = 'Error '.$this->db->lasterror();
+    		dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 
     		return -1;
     	}
@@ -313,34 +313,34 @@ class CUnits // extends CommonObject
     public function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->label)) $this->libelle=trim($this->label);
-		if (isset($this->short_label)) $this->libelle=trim($this->short_label);
-		if (isset($this->unit_type)) $this->libelle=trim($this->unit_type);
-		if (isset($this->scale)) $this->scale=trim($this->scale);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->label)) $this->libelle = trim($this->label);
+		if (isset($this->short_label)) $this->libelle = trim($this->short_label);
+		if (isset($this->unit_type)) $this->libelle = trim($this->unit_type);
+		if (isset($this->scale)) $this->scale = trim($this->scale);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_units SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-		$sql.= " short_label=".(isset($this->short_label)?"'".$this->db->escape($this->short_label)."'":"null").",";
-		$sql.= " unit_type=".(isset($this->unit_type)?"'".$this->db->escape($this->unit_type)."'":"null").",";
-		$sql.= " scale=".(isset($this->scale)?"'".$this->db->escape($this->scale)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null");
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " short_label=".(isset($this->short_label) ? "'".$this->db->escape($this->short_label)."'" : "null").",";
+		$sql .= " unit_type=".(isset($this->unit_type) ? "'".$this->db->escape($this->unit_type)."'" : "null").",";
+		$sql .= " scale=".(isset($this->scale) ? "'".$this->db->escape($this->scale)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null");
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		//if (! $error)
 		//{
@@ -361,13 +361,13 @@ class CUnits // extends CommonObject
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -387,16 +387,16 @@ class CUnits // extends CommonObject
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_units";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		//if (! $error)
 		//{
@@ -417,13 +417,13 @@ class CUnits // extends CommonObject
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index 76f1572353b..15b70ae17c9 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -22,15 +22,15 @@
 
 //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');
 
-require '../../main.inc.php';	// Load $user and permissions
+require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 
 $idbom = GETPOST('idbom', 'alpha');
@@ -42,7 +42,7 @@ $action = GETPOST('action', 'alpha');
  */
 
 $object = new BOM($db);
-$result=$object->fetch($idbom);
+$result = $object->fetch($idbom);
 if ($result > 0)
 {
 	// We remove properties we don't need in answer
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 72fd475e6ae..b7a5111f775 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -37,11 +37,11 @@ class FormProduct
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	// Cache arrays
-	public $cache_warehouses=array();
-	public $cache_lot=array();
+	public $cache_warehouses = array();
+	public $cache_lot = array();
 
 
 	/**
@@ -76,7 +76,7 @@ class FormProduct
 	{
 		global $conf, $langs;
 
-		if (empty($fk_product) && count($this->cache_warehouses)) return 0;    // Cache already loaded and we do not want a list with information specific to a product
+		if (empty($fk_product) && count($this->cache_warehouses)) return 0; // Cache already loaded and we do not want a list with information specific to a product
 
 		if (is_array($exclude))	$excludeGroups = implode("','", $exclude);
 
@@ -100,59 +100,59 @@ class FormProduct
 		{
 			if (!empty($batch))
 			{
-				$sql.= ", pb.qty as stock";
+				$sql .= ", pb.qty as stock";
 			}
 			else
 			{
-				$sql.= ", ps.reel as stock";
+				$sql .= ", ps.reel as stock";
 			}
 		}
 		elseif ($sumStock)
 		{
-			$sql.= ", sum(ps.reel) as stock";
+			$sql .= ", sum(ps.reel) as stock";
 		}
-		$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_entrepot = e.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_entrepot = e.rowid";
 		if (!empty($fk_product))
 		{
-			$sql.= " AND ps.fk_product = '".$fk_product."'";
+			$sql .= " AND ps.fk_product = '".$fk_product."'";
 			if (!empty($batch))
 			{
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb on pb.fk_product_stock = ps.rowid AND pb.batch = '".$batch."'";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb on pb.fk_product_stock = ps.rowid AND pb.batch = '".$batch."'";
 			}
 		}
-		$sql.= " WHERE e.entity IN (".getEntity('stock').")";
+		$sql .= " WHERE e.entity IN (".getEntity('stock').")";
 		if (count($warehouseStatus))
 		{
-			$sql.= " AND e.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")";
+			$sql .= " AND e.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")";
 		}
 		else
 		{
-			$sql.= " AND e.statut = 1";
+			$sql .= " AND e.statut = 1";
 		}
 
-		if(!empty($exclude)) $sql.= ' AND e.rowid NOT IN('.$this->db->escape(implode(',', $exclude)).')';
+		if (!empty($exclude)) $sql .= ' AND e.rowid NOT IN('.$this->db->escape(implode(',', $exclude)).')';
 
 		// minimum stock
         if ($stockMin !== false) {
             if (!empty($fk_product)) {
                 if (!empty($batch)) {
-                    $sql .= " AND pb.qty > " . $this->db->escape($stockMin);
+                    $sql .= " AND pb.qty > ".$this->db->escape($stockMin);
                 } else {
-                    $sql .= " AND ps.reel > " . $this->db->escape($stockMin);
+                    $sql .= " AND ps.reel > ".$this->db->escape($stockMin);
                 }
             }
         }
 
 		if ($sumStock && empty($fk_product)) {
-		    $sql.= " GROUP BY e.rowid, e.ref, e.description, e.fk_parent";
+		    $sql .= " GROUP BY e.rowid, e.ref, e.description, e.fk_parent";
 
             // minimum stock
             if ($stockMin !== false) {
-                $sql .= " HAVING sum(ps.reel) > " . $this->db->escape($stockMin);
+                $sql .= " HAVING sum(ps.reel) > ".$this->db->escape($stockMin);
             }
 		}
-        $sql.= " ORDER BY " . $orderBy;
+        $sql .= " ORDER BY ".$orderBy;
 
 		dol_syslog(get_class($this).'::loadWarehouses', LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -164,16 +164,16 @@ class FormProduct
 			{
 				$obj = $this->db->fetch_object($resql);
 				if ($sumStock) $obj->stock = price2num($obj->stock, 5);
-				$this->cache_warehouses[$obj->rowid]['id'] =$obj->rowid;
-				$this->cache_warehouses[$obj->rowid]['label']=$obj->label;
-				$this->cache_warehouses[$obj->rowid]['parent_id']=$obj->fk_parent;
+				$this->cache_warehouses[$obj->rowid]['id'] = $obj->rowid;
+				$this->cache_warehouses[$obj->rowid]['label'] = $obj->label;
+				$this->cache_warehouses[$obj->rowid]['parent_id'] = $obj->fk_parent;
 				$this->cache_warehouses[$obj->rowid]['description'] = $obj->description;
 				$this->cache_warehouses[$obj->rowid]['stock'] = $obj->stock;
 				$i++;
 			}
 
 			// Full label init
-			foreach($this->cache_warehouses as $obj_rowid=>$tab) {
+			foreach ($this->cache_warehouses as $obj_rowid=>$tab) {
 				$this->cache_warehouses[$obj_rowid]['full_label'] = $this->get_parent_path($tab);
 			}
 
@@ -197,11 +197,11 @@ class FormProduct
 	private function get_parent_path($tab, $final_label = '')
 	{
 		//phpcs:enable
-		if(empty($final_label)) $final_label = $tab['label'];
+		if (empty($final_label)) $final_label = $tab['label'];
 
-		if(empty($tab['parent_id'])) return $final_label;
+		if (empty($tab['parent_id'])) return $final_label;
 		else {
-			if(!empty($this->cache_warehouses[$tab['parent_id']])) {
+			if (!empty($this->cache_warehouses[$tab['parent_id']])) {
 				$final_label = $this->cache_warehouses[$tab['parent_id']]['label'].' >> '.$final_label;
 				return $this->get_parent_path($this->cache_warehouses[$tab['parent_id']], $final_label);
 			}
@@ -309,8 +309,8 @@ class FormProduct
             print '</tr></table></form>';
         } else {
             if ($selected) {
-                require_once DOL_DOCUMENT_ROOT .'/product/stock/class/entrepot.class.php';
-                $warehousestatic=new Entrepot($this->db);
+                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+                $warehousestatic = new Entrepot($this->db);
                 $warehousestatic->fetch($selected);
                 print $warehousestatic->getNomUrl();
             } else {
@@ -357,7 +357,7 @@ class FormProduct
 		$return = '';
 
 		// TODO Use a cache
-		require_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 		$measuringUnits = new CUnits($db);
 
 		$filter = array();
@@ -375,10 +375,10 @@ class FormProduct
 			dol_print_error($db);
 			return -1;
 		} else {
-			$return .= '<select class="flat" name="' . $name . '">';
+			$return .= '<select class="flat" name="'.$name.'">';
 			if ($adddefault || $adddefault === '')
 			{
-				$return .= '<option value="0">' . ($adddefault ? $langs->trans("Default") : ''). '</option>';
+				$return .= '<option value="0">'.($adddefault ? $langs->trans("Default") : '').'</option>';
 			}
 
 			foreach ($measuringUnits->records as $lines)
@@ -392,7 +392,7 @@ class FormProduct
 				elseif ($mode == 2 && $lines->scale == $default) $return .= ' selected';
 				elseif ($mode == 0 && $lines->id == $default) $return .= ' selected';
 				$return .= '>';
-				if ($measuring_style == 'time') $return.= $langs->trans(ucfirst($lines->label));
+				if ($measuring_style == 'time') $return .= $langs->trans(ucfirst($lines->label));
 				else $return .= $langs->trans($lines->label);
 				$return .= '</option>';
 			}
@@ -426,11 +426,11 @@ class FormProduct
 
 		dol_syslog(get_class($this)."::selectLot $selected, $htmlname, $filterstatus, $empty, $disabled, $fk_product, $fk_entrepot, $empty_label, $forcecombo, $morecss", LOG_DEBUG);
 
-		$out='';
+		$out = '';
 		$productIdArray = array();
-		if (! is_array($objectLines) || ! count($objectLines))
+		if (!is_array($objectLines) || !count($objectLines))
 		{
-			if (! empty($fk_product)) $productIdArray[] = $fk_product;
+			if (!empty($fk_product)) $productIdArray[] = $fk_product;
 		}
 		else
 		{
@@ -515,7 +515,7 @@ class FormProduct
 			// check cache already loaded for product id's
 			foreach ($productIdArray as $productId)
 			{
-				$cacheLoaded = ! empty($this->cache_lot[$productId]) ? true : false;
+				$cacheLoaded = !empty($this->cache_lot[$productId]) ? true : false;
 			}
 		}
 		if ($cacheLoaded)
@@ -528,14 +528,14 @@ class FormProduct
 			$this->cache_lot = array();
 			$productIdList = implode(',', $productIdArray);
 			$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.ref as label, ps.fk_product";
-			$sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.rowid = pb.fk_product_stock";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (".getEntity('stock').")";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.rowid = pb.fk_product_stock";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (".getEntity('stock').")";
 			if (!empty($productIdList))
 			{
-				$sql.= " WHERE ps.fk_product IN (".$productIdList.")";
+				$sql .= " WHERE ps.fk_product IN (".$productIdList.")";
 			}
-			$sql.= " ORDER BY e.ref, pb.batch";
+			$sql .= " ORDER BY e.ref, pb.batch";
 
 			dol_syslog(get_class($this).'::loadLotStock', LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -546,10 +546,10 @@ class FormProduct
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$this->cache_lot[$obj->fk_product][$obj->rowid]['id'] =$obj->rowid;
-					$this->cache_lot[$obj->fk_product][$obj->rowid]['batch']=$obj->batch;
-					$this->cache_lot[$obj->fk_product][$obj->rowid]['entrepot_id']=$obj->fk_entrepot;
-					$this->cache_lot[$obj->fk_product][$obj->rowid]['entrepot_label']=$obj->label;
+					$this->cache_lot[$obj->fk_product][$obj->rowid]['id'] = $obj->rowid;
+					$this->cache_lot[$obj->fk_product][$obj->rowid]['batch'] = $obj->batch;
+					$this->cache_lot[$obj->fk_product][$obj->rowid]['entrepot_id'] = $obj->fk_entrepot;
+					$this->cache_lot[$obj->fk_product][$obj->rowid]['entrepot_label'] = $obj->label;
 					$this->cache_lot[$obj->fk_product][$obj->rowid]['qty'] = $obj->qty;
 					$i++;
 				}
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 51af2f2b14d..c2e81f5d36a 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -94,9 +94,9 @@ if (empty($reshook))
 	// Cancel
 	if ($cancel)
 	{
-		if (GETPOST("comefromclone")==1)
+		if (GETPOST("comefromclone") == 1)
 		{
-			$result=$object->delete($user);
+			$result = $object->delete($user);
 			if ($result > 0)
 			{
 				header("Location: index.php");
@@ -119,7 +119,7 @@ if (empty($reshook))
 
 	if ($action == 'add' && $user->rights->projet->creer)
 	{
-		$error=0;
+		$error = 0;
 		if (empty($_POST["ref"]))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
@@ -131,21 +131,21 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if (GETPOST('opp_amount') != '' && ! (GETPOST('opp_status') > 0))
+		if (GETPOST('opp_amount') != '' && !(GETPOST('opp_status') > 0))
 		{
 			$error++;
 			setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
 		}
 
 		// Create with status validated immediatly
-		if (! empty($conf->global->PROJECT_CREATE_NO_DRAFT))
+		if (!empty($conf->global->PROJECT_CREATE_NO_DRAFT))
 		{
-			$status=Project::STATUS_VALIDATED;
+			$status = Project::STATUS_VALIDATED;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$error=0;
+			$error = 0;
 
 			$db->begin();
 
@@ -156,23 +156,23 @@ if (empty($reshook))
 			$object->public          = GETPOST('public', 'alpha');
 			$object->opp_amount      = price2num(GETPOST('opp_amount', 'alpha'));
 			$object->budget_amount   = price2num(GETPOST('budget_amount', 'alpha'));
-			$object->date_c           = dol_now();
+			$object->date_c = dol_now();
 			$object->date_start      = $date_start;
 			$object->date_end        = $date_end;
 			$object->statut          = $status;
 			$object->opp_status      = $opp_status;
 			$object->opp_percent     = $opp_percent;
-			$object->usage_opportunity    = (GETPOST('usage_opportunity', 'alpha')=='on'?1:0);
-			$object->usage_task           = (GETPOST('usage_task', 'alpha')=='on'?1:0);
-			$object->usage_bill_time      = (GETPOST('usage_bill_time', 'alpha')=='on'?1:0);
-			$object->usage_organize_event = (GETPOST('usage_organize_event', 'alpha')=='on'?1:0);
+			$object->usage_opportunity    = (GETPOST('usage_opportunity', 'alpha') == 'on' ? 1 : 0);
+			$object->usage_task           = (GETPOST('usage_task', 'alpha') == 'on' ? 1 : 0);
+			$object->usage_bill_time      = (GETPOST('usage_bill_time', 'alpha') == 'on' ? 1 : 0);
+			$object->usage_organize_event = (GETPOST('usage_organize_event', 'alpha') == 'on' ? 1 : 0);
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
 			if ($ret < 0) $error++;
 
 			$result = $object->create($user);
-			if (! $error && $result > 0)
+			if (!$error && $result > 0)
 			{
 				// Add myself as project leader
 				$result = $object->add_contact($user->id, 'PROJECTLEADER', 'internal');
@@ -189,26 +189,26 @@ if (empty($reshook))
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
-			if (! $error && !empty($object->id) > 0)
+			if (!$error && !empty($object->id) > 0)
 			{
 				// Category association
 				$categories = GETPOST('categories', 'array');
-				$result=$object->setCategories($categories);
-				if ($result<0) {
+				$result = $object->setCategories($categories);
+				if ($result < 0) {
 					$langs->load("errors");
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$db->commit();
 
-				if (! empty($backtopage))
+				if (!empty($backtopage))
 				{
-					$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage);	// New method to autoselect project after a New on another form object creation
-					$backtopage = $backtopage.'&projectid='.$object->id;	// Old method
+					$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
+					$backtopage = $backtopage.'&projectid='.$object->id; // Old method
 					header("Location: ".$backtopage);
 					exit;
 				}
@@ -231,9 +231,9 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
+	if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 	{
-		$error=0;
+		$error = 0;
 
 		if (empty($ref))
 		{
@@ -250,7 +250,7 @@ if (empty($reshook))
 
 		$db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
 			$object->oldcopy = clone $object;
 
@@ -260,18 +260,18 @@ if (empty($reshook))
 			$object->title        = GETPOST('title', 'none'); // Do not use 'alpha' here, we want field as it is
 			$object->statut       = GETPOST('status', 'int');
 			$object->socid        = GETPOST('socid', 'int');
-			$object->description  = GETPOST('description', 'none');	// Do not use 'alpha' here, we want field as it is
+			$object->description  = GETPOST('description', 'none'); // Do not use 'alpha' here, we want field as it is
 			$object->public       = GETPOST('public', 'alpha');
-			$object->date_start   = empty($_POST["projectstart"])?'':$date_start;
-			$object->date_end     = empty($_POST["projectend"])?'':$date_end;
+			$object->date_start   = empty($_POST["projectstart"]) ? '' : $date_start;
+			$object->date_end     = empty($_POST["projectend"]) ? '' : $date_end;
 			if (isset($_POST['opp_amount']))    $object->opp_amount   = price2num(GETPOST('opp_amount', 'alpha'));
-			if (isset($_POST['budget_amount'])) $object->budget_amount= price2num(GETPOST('budget_amount', 'alpha'));
+			if (isset($_POST['budget_amount'])) $object->budget_amount = price2num(GETPOST('budget_amount', 'alpha'));
 			if (isset($_POST['opp_status']))    $object->opp_status   = $opp_status;
 			if (isset($_POST['opp_percent']))   $object->opp_percent  = $opp_percent;
-			$object->usage_opportunity    = (GETPOST('usage_opportunity', 'alpha')=='on'?1:0);
-			$object->usage_task           = (GETPOST('usage_task', 'alpha')=='on'?1:0);
-			$object->usage_bill_time      = (GETPOST('usage_bill_time', 'alpha')=='on'?1:0);
-			$object->usage_organize_event = (GETPOST('usage_organize_event', 'alpha')=='on'?1:0);
+			$object->usage_opportunity    = (GETPOST('usage_opportunity', 'alpha') == 'on' ? 1 : 0);
+			$object->usage_task           = (GETPOST('usage_task', 'alpha') == 'on' ? 1 : 0);
+			$object->usage_bill_time      = (GETPOST('usage_bill_time', 'alpha') == 'on' ? 1 : 0);
+			$object->usage_organize_event = (GETPOST('usage_organize_event', 'alpha') == 'on' ? 1 : 0);
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -284,18 +284,18 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$result=$object->update($user);
+			$result = $object->update($user);
 			if ($result < 0)
 			{
 				$error++;
 				if ($result == -4) setEventMessages($langs->trans("ErrorRefAlreadyExists"), null, 'errors');
 				else setEventMessages($object->error, $object->errors, 'errors');
-			}else {
+			} else {
 				// Category association
 				$categories = GETPOST('categories', 'array');
-				$result=$object->setCategories($categories);
+				$result = $object->setCategories($categories);
 				if ($result < 0)
 				{
 					$error++;
@@ -304,11 +304,11 @@ if (empty($reshook))
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			if (GETPOST("reportdate") && ($object->date_start!=$old_start_date))
+			if (GETPOST("reportdate") && ($object->date_start != $old_start_date))
 			{
-				$result=$object->shiftTaskDate($old_start_date);
+				$result = $object->shiftTaskDate($old_start_date);
 				if ($result < 0)
 				{
 					$error++;
@@ -332,7 +332,7 @@ if (empty($reshook))
 		if ($error)
 		{
 			$db->rollback();
-			$action='edit';
+			$action = 'edit';
 		}
 		else
 		{
@@ -355,11 +355,11 @@ if (empty($reshook))
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
 		}
-		$result= $object->generateDocument($object->modelpdf, $outputlangs);
+		$result = $object->generateDocument($object->modelpdf, $outputlangs);
 		if ($result <= 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-			$action='';
+			$action = '';
 		}
 	}
 
@@ -368,11 +368,11 @@ if (empty($reshook))
 	{
 		if ($object->id > 0)
 		{
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 			$langs->load("other");
 			$upload_dir = $conf->projet->dir_output;
-			$file = $upload_dir . '/' . GETPOST('file');
+			$file = $upload_dir.'/'.GETPOST('file');
 			$ret = dol_delete_file($file, 0, 0, 0, $object);
 			if ($ret)
 				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
@@ -413,7 +413,7 @@ if (empty($reshook))
 	if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->projet->supprimer)
 	{
 		$object->fetch($id);
-		$result=$object->delete($user);
+		$result = $object->delete($user);
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
@@ -429,15 +429,15 @@ if (empty($reshook))
 
 	if ($action == 'confirm_clone' && $user->rights->projet->creer && $confirm == 'yes')
 	{
-		$clone_contacts=GETPOST('clone_contacts')?1:0;
-		$clone_tasks=GETPOST('clone_tasks')?1:0;
+		$clone_contacts = GETPOST('clone_contacts') ? 1 : 0;
+		$clone_tasks = GETPOST('clone_tasks') ? 1 : 0;
 		$clone_project_files = GETPOST('clone_project_files') ? 1 : 0;
 		$clone_task_files = GETPOST('clone_task_files') ? 1 : 0;
-		$clone_notes=GETPOST('clone_notes')?1:0;
-		$move_date=GETPOST('move_date')?1:0;
-		$clone_thirdparty=GETPOST('socid', 'int')?GETPOST('socid', 'int'):0;
+		$clone_notes = GETPOST('clone_notes') ? 1 : 0;
+		$move_date = GETPOST('move_date') ? 1 : 0;
+		$clone_thirdparty = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : 0;
 
-		$result=$object->createFromClone($user, $object->id, $clone_contacts, $clone_tasks, $clone_project_files, $clone_task_files, $clone_notes, $move_date, 0, $clone_thirdparty);
+		$result = $object->createFromClone($user, $object->id, $clone_contacts, $clone_tasks, $clone_project_files, $clone_task_files, $clone_notes, $move_date, 0, $clone_thirdparty);
 		if ($result <= 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -445,21 +445,21 @@ if (empty($reshook))
 		else
 		{
 			// Load new object
-			$newobject=new Project($db);
+			$newobject = new Project($db);
 			$newobject->fetch($result);
 			$newobject->fetch_optionals();
-			$newobject->fetch_thirdparty();	// Load new object
-			$object=$newobject;
-			$action='edit';
-			$comefromclone=true;
+			$newobject->fetch_thirdparty(); // Load new object
+			$object = $newobject;
+			$action = 'edit';
+			$comefromclone = true;
 		}
 	}
 
 	// Actions to send emails
-	$trigger_name='PROJECT_SENTBYMAIL';
-	$paramname='id';
-	$autocopy='MAIN_MAIL_AUTOCOPY_PROJECT_TO';		// used to know the automatic BCC to add
-	$trackid='proj'.$object->id;
+	$trigger_name = 'PROJECT_SENTBYMAIL';
+	$paramname = 'id';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_PROJECT_TO'; // used to know the automatic BCC to add
+	$trackid = 'proj'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
@@ -473,21 +473,21 @@ $formfile = new FormFile($db);
 $formproject = new FormProjets($db);
 $userstatic = new User($db);
 
-$title=$langs->trans("Project").' - '.$object->ref.($object->thirdparty->name?' - '.$object->thirdparty->name:'').($object->title?' - '.$object->title:'');
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE)) $title=$object->ref.($object->thirdparty->name?' - '.$object->thirdparty->name:'').($object->title?' - '.$object->title:'');
-$help_url="EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+$title = $langs->trans("Project").' - '.$object->ref.($object->thirdparty->name ? ' - '.$object->thirdparty->name : '').($object->title ? ' - '.$object->title : '');
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE)) $title = $object->ref.($object->thirdparty->name ? ' - '.$object->thirdparty->name : '').($object->title ? ' - '.$object->title : '');
+$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 
 llxHeader("", $title, $help_url);
 
-$titleboth=$langs->trans("LeadsOrProjects");
-$titlenew = $langs->trans("NewLeadOrProject");	// Leads and opportunities by default
+$titleboth = $langs->trans("LeadsOrProjects");
+$titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default
 if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
 {
-	$titleboth=$langs->trans("Projects");
+	$titleboth = $langs->trans("Projects");
 	$titlenew = $langs->trans("NewProject");
 }
 if ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
-	$titleboth=$langs->trans("Leads");
+	$titleboth = $langs->trans("Leads");
 	$titlenew = $langs->trans("NewLead");
 }
 
@@ -497,7 +497,7 @@ if ($action == 'create' && $user->rights->projet->creer)
      * Create
      */
 
-	$thirdparty=new Societe($db);
+	$thirdparty = new Societe($db);
 	if ($socid > 0) $thirdparty->fetch($socid);
 
 	print load_fiche_titre($titlenew, '', 'project');
@@ -511,18 +511,18 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
-	$defaultref='';
-	$modele = empty($conf->global->PROJECT_ADDON)?'mod_project_simple':$conf->global->PROJECT_ADDON;
+	$defaultref = '';
+	$modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
 
 	// Search template files
-	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach($dirmodels as $reldir)
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir)
 	{
-		$file=dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
+		$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
 		if (file_exists($file))
 		{
-			$filefound=1;
+			$filefound = 1;
 			$classname = $modele;
 			break;
 		}
@@ -530,16 +530,16 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 	if ($filefound)
 	{
-		$result=dol_include_once($reldir."core/modules/project/".$modele.'.php');
+		$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
 		$modProject = new $classname;
 
 		$defaultref = $modProject->getNextValue($thirdparty, $object);
 	}
 
-	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
+	if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
 
 	// Ref
-	$suggestedref=($_POST["ref"]?$_POST["ref"]:$defaultref);
+	$suggestedref = ($_POST["ref"] ? $_POST["ref"] : $defaultref);
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="12" type="text" name="ref" value="'.dol_escape_htmltag($suggestedref).'">';
 	print ' '.$form->textwithpicto('', $langs->trans("YouCanCompleteRef", $suggestedref));
 	print '</td></tr>';
@@ -552,23 +552,23 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print $langs->trans("Usage");
 	print '</td>';
 	print '<td>';
-	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	{
-		print '<input type="checkbox" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha')!=''?' checked="checked"':'') : ' checked="checked"').'"> ';
+		print '<input type="checkbox" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 		$htmltext = $langs->trans("ProjectFollowOpportunity");
 		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 		print '<br>';
 	}
 	if (empty($conf->global->PROJECT_HIDE_TASKS))
 	{
-		print '<input type="checkbox" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha')!=''?' checked="checked"':'') : ' checked="checked"').'"> ';
+		print '<input type="checkbox" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 		$htmltext = $langs->trans("ProjectFollowTasks");
 		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 		print '<br>';
 	}
-	if (! empty($conf->global->PROJECT_BILL_TIME_SPENT))
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
 	{
-		print '<input type="checkbox" name="usage_bill_time"'.(GETPOST('usage_bill_time', 'alpha')!=''?' checked="checked"':'').'"> ';
+		print '<input type="checkbox" name="usage_bill_time"'.(GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '').'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
 		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 		print '<br>';
@@ -584,20 +584,20 @@ if ($action == 'create' && $user->rights->projet->creer)
 	if ($conf->societe->enabled)
 	{
 		print '<tr><td>';
-		print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED)?'':'<span class="fieldrequired">');
+		print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '<span class="fieldrequired">');
 		print $langs->trans("ThirdParty");
-		print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED)?'':'</span>');
+		print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '</span>');
 		print '</td><td class="maxwidthonsmartphone">';
-		$filteronlist='';
-		if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
-	   	$text=$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300');
+		$filteronlist = '';
+		if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
+	   	$text = $form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300');
 		if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
 		{
-			$texthelp=$langs->trans("IfNeedToUseOtherObjectKeepEmpty");
+			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 			print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1);
 		}
 		else print $text;
-		if (! GETPOSTISSET('backtopage')) print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddThirdParty").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
+		if (!GETPOSTISSET('backtopage')) print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddThirdParty").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 		print '</td></tr>';
 	}
 
@@ -612,46 +612,46 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 	// Visibility
 	print '<tr><td>'.$langs->trans("Visibility").'</td><td class="maxwidthonsmartphone">';
-	$array=array();
+	$array = array();
 	if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject");
 	if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject");
-	print $form->selectarray('public', $array, GETPOST('public')?GETPOST('public'):$object->public);
+	print $form->selectarray('public', $array, GETPOST('public') ?GETPOST('public') : $object->public);
 	print '</td></tr>';
 
 	// Date start
 	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-	print $form->selectDate(($date_start?$date_start:''), 'projectstart', 0, 0, 0, '', 1, 0);
+	print $form->selectDate(($date_start ? $date_start : ''), 'projectstart', 0, 0, 0, '', 1, 0);
 	print '</td></tr>';
 
 	// Date end
 	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-	print $form->selectDate(($date_end?$date_end:-1), 'projectend', 0, 0, 0, '', 1, 0);
+	print $form->selectDate(($date_end ? $date_end : -1), 'projectend', 0, 0, 0, '', 1, 0);
 	print '</td></tr>';
 
-	if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	{
 		// Opportunity status
 		print '<tr><td>'.$langs->trans("OpportunityStatus").'</td>';
 		print '<td class="maxwidthonsmartphone">';
-		print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status')?GETPOST('opp_status'):$object->opp_status);
+		print $formproject->selectOpportunityStatus('opp_status', GETPOST('opp_status') ?GETPOST('opp_status') : $object->opp_status);
 		print '</tr>';
 
 		// Opportunity probability
 		print '<tr><td>'.$langs->trans("OpportunityProbability").'</td>';
-		print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.dol_escape_htmltag(GETPOST('opp_percent')!=''?GETPOST('opp_percent'):'').'"><span class="hideonsmartphone"> %</span>';
-		print '<input type="hidden" name="opp_percent_not_set" id="opp_percent_not_set" value="'.dol_escape_htmltag(GETPOST('opp_percent')!=''?'0':'1').'">';
+		print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.dol_escape_htmltag(GETPOST('opp_percent') != '' ?GETPOST('opp_percent') : '').'"><span class="hideonsmartphone"> %</span>';
+		print '<input type="hidden" name="opp_percent_not_set" id="opp_percent_not_set" value="'.dol_escape_htmltag(GETPOST('opp_percent') != '' ? '0' : '1').'">';
 		print '</td>';
 		print '</tr>';
 
 		// Opportunity amount
 		print '<tr><td>'.$langs->trans("OpportunityAmount").'</td>';
-		print '<td><input size="5" type="text" name="opp_amount" value="'.dol_escape_htmltag(GETPOST('opp_amount')!=''?GETPOST('opp_amount'):'').'"></td>';
+		print '<td><input size="5" type="text" name="opp_amount" value="'.dol_escape_htmltag(GETPOST('opp_amount') != '' ?GETPOST('opp_amount') : '').'"></td>';
 		print '</tr>';
 	}
 
 	// Budget
 	print '<tr><td>'.$langs->trans("Budget").'</td>';
-	print '<td><input size="5" type="text" name="budget_amount" value="'.dol_escape_htmltag(GETPOST('budget_amount')!=''?GETPOST('budget_amount'):'').'"></td>';
+	print '<td><input size="5" type="text" name="budget_amount" value="'.dol_escape_htmltag(GETPOST('budget_amount') != '' ?GETPOST('budget_amount') : '').'"></td>';
 	print '</tr>';
 
 	// Description
@@ -664,14 +664,14 @@ if ($action == 'create' && $user->rights->projet->creer)
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
-		$arrayselected=GETPOST('categories', 'array');
+		$arrayselected = GETPOST('categories', 'array');
 		print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
 		print "</td></tr>";
 	}
 
 	// Other options
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	$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))
 	{
@@ -684,7 +684,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
-	if (! empty($backtopage))
+	if (!empty($backtopage))
 	{
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -692,7 +692,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	else
 	{
 		print ' &nbsp; &nbsp; ';
-		print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	}
 	print '</div>';
 
@@ -721,7 +721,7 @@ elseif ($object->id > 0)
      * Show or edit
      */
 
-	$res=$object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
 	// To verify role of users
 	$userAccess = $object->restrictedProjectArea($user, 'read');
@@ -748,26 +748,26 @@ elseif ($object->id > 0)
 	// Confirmation delete
 	if ($action == 'delete')
 	{
-		$text=$langs->trans("ConfirmDeleteAProject");
-		$task=new Task($db);
-		$taskarray=$task->getTasksArray(0, 0, $object->id, 0, 0);
-		$nboftask=count($taskarray);
-		if ($nboftask) $text.='<br>'.img_warning().' '.$langs->trans("ThisWillAlsoRemoveTasks", $nboftask);
+		$text = $langs->trans("ConfirmDeleteAProject");
+		$task = new Task($db);
+		$taskarray = $task->getTasksArray(0, 0, $object->id, 0, 0);
+		$nboftask = count($taskarray);
+		if ($nboftask) $text .= '<br>'.img_warning().' '.$langs->trans("ThisWillAlsoRemoveTasks", $nboftask);
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteAProject"), $text, "confirm_delete", '', '', 1);
 	}
 
 	// Clone confirmation
 	if ($action == 'clone')
 	{
-		$formquestion=array(
+		$formquestion = array(
 			'text' => $langs->trans("ConfirmClone"),
-			array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company(GETPOST('socid', 'int')>0?GETPOST('socid', 'int'):$object->socid, 'socid', '', "None", 0, 0, null, 0, 'minwidth200')),
-			array('type' => 'checkbox', 'name' => 'clone_contacts',		'label' => $langs->trans("CloneContacts"), 			'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_tasks',   		'label' => $langs->trans("CloneTasks"), 			'value' => true),
-			array('type' => 'checkbox', 'name' => 'move_date',   		'label' => $langs->trans("CloneMoveDate"), 			'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_notes',   		'label' => $langs->trans("CloneNotes"), 			'value' => true),
-			array('type' => 'checkbox', 'name' => 'clone_project_files','label' => $langs->trans("CloneProjectFiles"),	    'value' => false),
-			array('type' => 'checkbox', 'name' => 'clone_task_files',	'label' => $langs->trans("CloneTaskFiles"),         'value' => false)
+			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int') > 0 ?GETPOST('socid', 'int') : $object->socid, 'socid', '', "None", 0, 0, null, 0, 'minwidth200')),
+			array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
+			array('type' => 'checkbox', 'name' => 'clone_tasks', 'label' => $langs->trans("CloneTasks"), 'value' => true),
+			array('type' => 'checkbox', 'name' => 'move_date', 'label' => $langs->trans("CloneMoveDate"), 'value' => true),
+			array('type' => 'checkbox', 'name' => 'clone_notes', 'label' => $langs->trans("CloneNotes"), 'value' => true),
+			array('type' => 'checkbox', 'name' => 'clone_project_files', 'label' => $langs->trans("CloneProjectFiles"), 'value' => false),
+			array('type' => 'checkbox', 'name' => 'clone_task_files', 'label' => $langs->trans("CloneTaskFiles"), 'value' => false)
 		);
 
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CloneProject"), $langs->trans("ConfirmCloneProject"), "confirm_clone", $formquestion, '', 1, 300, 590);
@@ -803,9 +803,9 @@ elseif ($object->id > 0)
 		// Status
 		print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td><td>';
 		print '<select class="flat" name="status">';
-		foreach($object->statuts_short as $key => $val)
+		foreach ($object->statuts_short as $key => $val)
 		{
-			print '<option value="'.$key.'"'.((GETPOSTISSET('status')?GETPOST('status'):$object->statut) == $key ? ' selected="selected"':'').'>'.$langs->trans($val).'</option>';
+			print '<option value="'.$key.'"'.((GETPOSTISSET('status') ?GETPOST('status') : $object->statut) == $key ? ' selected="selected"' : '').'>'.$langs->trans($val).'</option>';
 		}
 		print '</select>';
 		print '</td></tr>';
@@ -815,23 +815,23 @@ elseif ($object->id > 0)
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
-			print '<input type="checkbox" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha')!=''?' checked="checked"':'') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+			print '<input type="checkbox" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 			print '<br>';
 		}
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
-			print '<input type="checkbox" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha')!=''?' checked="checked"':'') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
+			print '<input type="checkbox" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (! empty($conf->global->PROJECT_BILL_TIME_SPENT))
+		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
 		{
-			print '<input type="checkbox" name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha')!=''?' checked="checked"':'') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+			print '<input type="checkbox" name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
@@ -842,16 +842,16 @@ elseif ($object->id > 0)
 		if ($conf->societe->enabled)
 		{
 			print '<tr><td>';
-			print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED)?'':'<span class="fieldrequired">');
+			print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '<span class="fieldrequired">');
 			print $langs->trans("ThirdParty");
-			print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED)?'':'</span>');
+			print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '</span>');
 			print '</td><td>';
-			$filteronlist='';
-			if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
-			$text=$form->select_company($object->thirdparty->id, 'socid', $filteronlist, 'None', 1, 0, array(), 0, 'minwidth300');
+			$filteronlist = '';
+			if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
+			$text = $form->select_company($object->thirdparty->id, 'socid', $filteronlist, 'None', 1, 0, array(), 0, 'minwidth300');
 			if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile))
 			{
-				$texthelp=$langs->trans("IfNeedToUseOtherObjectKeepEmpty");
+				$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 				print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1, 0, '', '', 2);
 			}
 			else print $text;
@@ -860,13 +860,13 @@ elseif ($object->id > 0)
 
 		// Visibility
 		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
-		$array=array();
+		$array = array();
 		if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) $array[0] = $langs->trans("PrivateProject");
 		if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) $array[1] = $langs->trans("SharedProject");
 		print $form->selectarray('public', $array, $object->public);
 		print '</td></tr>';
 
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
 			// Opportunity status
 			print '<tr><td>'.$langs->trans("OpportunityStatus").'</td>';
@@ -881,33 +881,33 @@ elseif ($object->id > 0)
 
 		    // Opportunity probability
 		    print '<tr><td>'.$langs->trans("OpportunityProbability").'</td>';
-		    print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(isset($_POST['opp_percent'])?GETPOST('opp_percent'):(strcmp($object->opp_percent, '')?vatrate($object->opp_percent):'')).'"> %';
+		    print '<td><input size="5" type="text" id="opp_percent" name="opp_percent" value="'.(isset($_POST['opp_percent']) ?GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ?vatrate($object->opp_percent) : '')).'"> %';
             print '<span id="oldopppercent"></span>';
 		    print '</td>';
 		    print '</tr>';
 
 		    // Opportunity amount
 		    print '<tr><td>'.$langs->trans("OpportunityAmount").'</td>';
-		    print '<td><input size="5" type="text" name="opp_amount" value="'.(isset($_POST['opp_amount'])?GETPOST('opp_amount'):(strcmp($object->opp_amount, '')?price2num($object->opp_amount):'')).'"></td>';
+		    print '<td><input size="5" type="text" name="opp_amount" value="'.(isset($_POST['opp_amount']) ?GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ?price2num($object->opp_amount) : '')).'"></td>';
 		    print '</tr>';
 	    }
 
 		// Date start
 		print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
-		print $form->selectDate($object->date_start?$object->date_start:-1, 'projectstart', 0, 0, 0, '', 1, 0);
+		print $form->selectDate($object->date_start ? $object->date_start : -1, 'projectstart', 0, 0, 0, '', 1, 0);
 		print ' &nbsp; &nbsp; <input type="checkbox" class="valignmiddle" name="reportdate" value="yes" ';
-		if ($comefromclone){print ' checked ';}
-		print '/> '. $langs->trans("ProjectReportDate");
+		if ($comefromclone) {print ' checked '; }
+		print '/> '.$langs->trans("ProjectReportDate");
 		print '</td></tr>';
 
 		// Date end
 		print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
-		print $form->selectDate($object->date_end?$object->date_end:-1, 'projectend', 0, 0, 0, '', 1, 0);
+		print $form->selectDate($object->date_end ? $object->date_end : -1, 'projectend', 0, 0, 0, '', 1, 0);
 		print '</td></tr>';
 
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td>';
-		print '<td><input size="5" type="text" name="budget_amount" value="'.(isset($_POST['budget_amount'])?GETPOST('budget_amount'):(strcmp($object->budget_amount, '')?price($object->budget_amount, 0, $langs, 1, 0):'')).'"></td>';
+		print '<td><input size="5" type="text" name="budget_amount" value="'.(isset($_POST['budget_amount']) ?GETPOST('budget_amount') : (strcmp($object->budget_amount, '') ?price($object->budget_amount, 0, $langs, 1, 0) : '')).'"></td>';
 		print '</tr>';
 
 		// Description
@@ -923,7 +923,7 @@ elseif ($object->id > 0)
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($object->id, Categorie::TYPE_PROJECT);
-			foreach($cats as $cat) {
+			foreach ($cats as $cat) {
 				$arrayselected[] = $cat->id;
 			}
 			print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
@@ -931,8 +931,8 @@ elseif ($object->id > 0)
 		}
 
 		// Other options
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		$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))
 		{
@@ -943,28 +943,28 @@ elseif ($object->id > 0)
 	}
 	else
 	{
-		dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
+		dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 		// Project card
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-		$morehtmlref='<div class="refidno">';
+		$morehtmlref = '<div class="refidno">';
 		// Title
-		$morehtmlref.=$object->title;
+		$morehtmlref .= $object->title;
 		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ';
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : ';
 		if ($object->thirdparty->id > 0)
 		{
 			$morehtmlref .= $object->thirdparty->getNomUrl(1, 'project');
 		}
-		$morehtmlref.='</div>';
+		$morehtmlref .= '</div>';
 
 		// Define a complementary filter for search of next/prev ref.
-		if (! $user->rights->projet->all->lire)
+		if (!$user->rights->projet->all->lire)
 		{
 			$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-			$object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',', array_keys($objectsListId)):'0').")";
+			$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
 		}
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -981,23 +981,23 @@ elseif ($object->id > 0)
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 		{
-			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha')!=''?' checked="checked"':'') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 			print '<br>';
 		}
 		if (empty($conf->global->PROJECT_HIDE_TASKS))
 		{
-			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha')!=''?' checked="checked"':'') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
+			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (! empty($conf->global->PROJECT_BILL_TIME_SPENT))
+		if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
 		{
-			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha')!=''?' checked="checked"':'') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
@@ -1010,7 +1010,7 @@ elseif ($object->id > 0)
 		else print $langs->trans('PrivateProject');
 		print '</td></tr>';
 
-		if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES) && ! empty($object->usage_opportunity))
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity))
 		{
 			// Opportunity status
 			print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
@@ -1036,10 +1036,10 @@ elseif ($object->id > 0)
 		// Date start - end
 		print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 		$start = dol_print_date($object->date_start, 'day');
-		print ($start?$start:'?');
+		print ($start ? $start : '?');
 		$end = dol_print_date($object->date_end, 'day');
 		print ' - ';
-		print ($end?$end:'?');
+		print ($end ? $end : '?');
 		if ($object->hasDelay()) print img_warning("Late");
 		print '</td></tr>';
 
@@ -1050,7 +1050,7 @@ elseif ($object->id > 0)
 
 		// Other attributes
 		$cols = 2;
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 
@@ -1067,7 +1067,7 @@ elseif ($object->id > 0)
 		print '</td></tr>';
 
 		// Categories
-		if($conf->categorie->enabled) {
+		if ($conf->categorie->enabled) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($object->id, 'project', 1);
 			print "</td></tr>";
@@ -1095,11 +1095,11 @@ elseif ($object->id > 0)
 	print '</form>';
 
 	// Change probability from status
-	if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	{
 		// Default value to close or not when we set opp to 'WON'.
-		$defaultcheckedwhenoppclose=1;
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) $defaultcheckedwhenoppclose=0;
+		$defaultcheckedwhenoppclose = 1;
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) $defaultcheckedwhenoppclose = 0;
 
 		print '<!-- Javascript to manage opportunity status change -->';
 		print '<script type="text/javascript" language="javascript">
@@ -1166,7 +1166,7 @@ elseif ($object->id > 0)
 																							  // modified by hook
 	if (empty($reshook))
 	{
-		if ($action != "edit" && $action != 'presend' )
+		if ($action != "edit" && $action != 'presend')
 		{
 			// Create event
 			/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 				// Add hidden condition because this is not a
@@ -1179,7 +1179,7 @@ elseif ($object->id > 0)
 			// Send
 			if ($object->statut != 2)
 			{
-				print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail').'</a>';
+				print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 			}
 
 			// Modify
@@ -1235,54 +1235,54 @@ elseif ($object->id > 0)
 			}
 
 			// Add button to create objects from project
-			if (! empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON))
+			if (!empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON))
 			{
-				if (! empty($conf->propal->enabled) && $user->rights->propal->creer)
+				if (!empty($conf->propal->enabled) && $user->rights->propal->creer)
 				{
 					$langs->load("propal");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddProp").'</a>';
 				}
-				if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
+				if (!empty($conf->commande->enabled) && $user->rights->commande->creer)
 				{
 					$langs->load("orders");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateOrder").'</a>';
 				}
-				if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
+				if (!empty($conf->facture->enabled) && $user->rights->facture->creer)
 				{
 					$langs->load("bills");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 				}
-				if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer)
+				if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer)
 				{
 					$langs->load("supplier_proposal");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddSupplierProposal").'</a>';
 				}
-				if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->creer)
+				if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->creer)
 				{
 					$langs->load("suppliers");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddSupplierOrder").'</a>';
 				}
-				if (! empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->creer)
+				if (!empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->creer)
 				{
 					$langs->load("suppliers");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddSupplierInvoice").'</a>';
 				}
-				if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer)
+				if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer)
 				{
 					$langs->load("interventions");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddIntervention").'</a>';
 				}
-				if (! empty($conf->contrat->enabled) && $user->rights->contrat->creer)
+				if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer)
 				{
 					$langs->load("contracts");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddContract").'</a>';
 				}
-				if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->creer)
+				if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer)
 				{
 					$langs->load("trips");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddTrip").'</a>';
 				}
-				if (! empty($conf->don->enabled) && $user->rights->don->creer)
+				if (!empty($conf->don->enabled) && $user->rights->don->creer)
 				{
 					$langs->load("donations");
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddDonation").'</a>';
@@ -1331,11 +1331,11 @@ elseif ($object->id > 0)
 		/*
          * Documents generes
          */
-		$filename=dol_sanitizeFileName($object->ref);
-		$filedir=$conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
-		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-		$genallowed=($user->rights->projet->lire && $userAccess > 0);
-		$delallowed=($user->rights->projet->creer && $userWrite > 0);
+		$filename = dol_sanitizeFileName($object->ref);
+		$filedir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed = ($user->rights->projet->lire && $userAccess > 0);
+		$delallowed = ($user->rights->projet->creer && $userWrite > 0);
 
 		print $formfile->showdocuments('project', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf);
 
@@ -1344,11 +1344,11 @@ elseif ($object->id > 0)
 		$MAXEVENT = 10;
 
 		$morehtmlright = '<a href="'.DOL_URL_ROOT.'/projet/info.php?id='.$object->id.'">';
-		$morehtmlright.= $langs->trans("SeeAll");
-		$morehtmlright.= '</a>';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
 
 		// List of actions on element
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'project', 0, 1, '', $MAXEVENT, '', $morehtmlright);
 
@@ -1356,17 +1356,17 @@ elseif ($object->id > 0)
 	}
 
 	// Presend form
-	$modelmail='project';
-	$defaulttopic='SendProjectRef';
+	$modelmail = 'project';
+	$defaulttopic = 'SendProjectRef';
 	$diroutput = $conf->projet->dir_output;
-	$autocopy='MAIN_MAIL_AUTOCOPY_PROJECT_TO';		// used to know the automatic BCC to add
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_PROJECT_TO'; // used to know the automatic BCC to add
 	$trackid = 'proj'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 
 	// Hook to add more things on page
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('mainCardTabAddMore', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('mainCardTabAddMore', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 }
 else
 {
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 40cf0f2f0d3..236f7750ef7 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -43,16 +43,16 @@ $id = GETPOST('id', 'int');
  * View
  */
 
-if ($action=="getProducts") {
+if ($action == "getProducts") {
     $object = new Categorie($db);
-    $result=$object->fetch($category);
+    $result = $object->fetch($category);
     if ($result > 0)
     {
 	    $prods = $object->getObjectsInCateg("product");
 	    // Removed properties we don't need
 	    if (is_array($prods) && count($prods) > 0)
 	    {
-	    	foreach($prods as $prod)
+	    	foreach ($prods as $prod)
 	    	{
 	    		unset($prod->fields);
 	    		unset($prod->db);
@@ -65,11 +65,11 @@ if ($action=="getProducts") {
     	echo 'Failed to load category with id='.$category;
     }
 }
-elseif ($action=="search" && $term != '') {
+elseif ($action == "search" && $term != '') {
     $sql = 'SELECT rowid, ref, label, tosell, tobuy FROM '.MAIN_DB_PREFIX.'product';
-    $sql.= ' WHERE entity IN ('.getEntity('product').')';
-    $sql.= ' AND tosell = 1';
-    $sql.= natural_search(array('ref','label','barcode'), $term);
+    $sql .= ' WHERE entity IN ('.getEntity('product').')';
+    $sql .= ' AND tosell = 1';
+    $sql .= natural_search(array('ref', 'label', 'barcode'), $term);
     $resql = $db->query($sql);
 	if ($resql)
 	{