From 3c1d78948233825885ae25e23917de487d1a8f35 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Thu, 16 Jan 2020 08:25:36 +0100
Subject: [PATCH 1/2] Visible receipt printer settings without stock module in
 TakePOS

---
 htdocs/takepos/admin/terminal.php | 53 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index d2769d77afb..b30cb4e7032 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -207,33 +207,34 @@ if (!empty($conf->stock->enabled))
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}
 	print '</td></tr>';
-	if ($conf->receiptprinter->enabled) {
-		// Select printer to use with terminal
-		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
-		$printer = new dolReceiptPrinter($db);
-		$printer->listprinters();
-		$printers = array();
-		foreach ($printer->listprinters as $key => $value) {
-			$printers[$value['rowid']] = $value['name'];
-		}
-		print '<tr class="oddeven"><td>'.$langs->trans("TakeposTerminalPrinterToUse").'</td>';
-		print '<td>';
-		print $form->selectarray('TAKEPOS_PRINTER_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}), 1);
-		print '</td></tr>';
-		$printer->listPrintersTemplates();
-		$templates = array();
-		foreach ($printer->listprinterstemplates as $key => $value) {
-			$templates[$value['rowid']] = $value['name'];
-		}
-		print '<tr class="oddeven"><td>'.$langs->trans("TakeposTerminalTemplateToUseForInvoicesTicket").'</td>';
-		print '<td>';
-		print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}), 1);
-		print '</td></tr>';
-		print '<tr class="oddeven"><td>'.$langs->trans("TakeposTerminalTemplateToUseForOrdersTicket").'</td>';
-		print '<td>';
-		print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}), 1);
-		print '</td></tr>';
+}
+
+if ($conf->receiptprinter->enabled) {
+	// Select printer to use with terminal
+	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+	$printer = new dolReceiptPrinter($db);
+	$printer->listprinters();
+	$printers = array();
+	foreach ($printer->listprinters as $key => $value) {
+		$printers[$value['rowid']] = $value['name'];
 	}
+	print '<tr class="oddeven"><td>'.$langs->trans("TakeposTerminalPrinterToUse").'</td>';
+	print '<td>';
+	print $form->selectarray('TAKEPOS_PRINTER_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}), 1);
+	print '</td></tr>';
+	$printer->listPrintersTemplates();
+	$templates = array();
+	foreach ($printer->listprinterstemplates as $key => $value) {
+		$templates[$value['rowid']] = $value['name'];
+	}
+	print '<tr class="oddeven"><td>'.$langs->trans("TakeposTerminalTemplateToUseForInvoicesTicket").'</td>';
+	print '<td>';
+	print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}), 1);
+	print '</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("TakeposTerminalTemplateToUseForOrdersTicket").'</td>';
+	print '<td>';
+	print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}), 1);
+	print '</td></tr>';
 }
 
 print '</table>';

From 8744f6ab7bc497dbe3650e57b415516b3a1f02a4 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Sat, 18 Jan 2020 15:17:07 +0000
Subject: [PATCH 2/2] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 htdocs/admin/tools/dolibarr_export.php        |   84 +-
 htdocs/comm/propal/list.php                   |   50 +-
 htdocs/commande/list.php                      |   34 +-
 htdocs/compta/bank/various_payment/list.php   |  166 +-
 htdocs/compta/facture/list.php                |   24 +-
 htdocs/core/class/dolgraph.class.php          |    2 +-
 htdocs/core/class/html.form.class.php         |   86 +-
 htdocs/core/class/utils.class.php             |    2 +-
 htdocs/core/modules/DolibarrModules.class.php |  856 ++++-----
 htdocs/core/modules/modAgenda.class.php       |   28 +-
 htdocs/core/modules/modUser.class.php         |  166 +-
 htdocs/expedition/list.php                    |   24 +-
 htdocs/exports/class/export.class.php         |  394 ++---
 .../fourn/class/fournisseur.facture.class.php |  690 ++++----
 htdocs/holiday/card.php                       |   22 +-
 htdocs/loan/list.php                          |    2 +-
 htdocs/salaries/list.php                      |   28 +-
 .../class/supplier_proposal.class.php         | 1524 ++++++++---------
 18 files changed, 2091 insertions(+), 2091 deletions(-)

diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index e5f6dae4852..854fd130bc5 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -29,18 +29,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 $langs->load("admin");
 
-$action=GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="date";
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "date";
 if (empty($page) || $page == -1) { $page = 0; }
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
-if (! $user->admin)
+if (!$user->admin)
 	accessforbidden();
 
 
@@ -52,33 +52,33 @@ if ($action == 'delete')
 {
 	if (preg_match('/^backup\//', GETPOST('urlfile', 'alpha')))
 	{
-		$file=$conf->admin->dir_output.'/backup/'.basename(GETPOST('urlfile', 'alpha'));
-		$ret=dol_delete_file($file, 1);
+		$file = $conf->admin->dir_output.'/backup/'.basename(GETPOST('urlfile', 'alpha'));
+		$ret = dol_delete_file($file, 1);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 	}
 	else
 	{
-		$file=$conf->admin->dir_output.'/documents/'.basename(GETPOST('urlfile', 'alpha'));
-		$ret=dol_delete_file($file, 1);
+		$file = $conf->admin->dir_output.'/documents/'.basename(GETPOST('urlfile', 'alpha'));
+		$ret = dol_delete_file($file, 1);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 	}
-	$action='';
+	$action = '';
 }
 
 /*
  * View
  */
 
-$form=new Form($db);
+$form = new Form($db);
 $formfile = new FormFile($db);
 
-$label=$db::LABEL;
-$type=$db->type;
+$label = $db::LABEL;
+$type = $db->type;
 //var_dump($db);
 
-$help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad';
+$help_url = 'EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad';
 llxHeader('', '', $help_url);
 
 print '<script type="text/javascript">
@@ -141,9 +141,9 @@ print '<br>';
 
 print '<div id="backupdatabaseleft" class="fichehalfleft" >';
 
-print load_fiche_titre($title?$title:$langs->trans("BackupDumpWizard"));
+print load_fiche_titre($title ? $title : $langs->trans("BackupDumpWizard"));
 
-print '<table width="100%" class="'.($useinecm?'nobordernopadding':'liste').' nohover">';
+print '<table width="100%" class="'.($useinecm ? 'nobordernopadding' : 'liste').' nohover">';
 print '<tr class="liste_titre">';
 print '<td class="liste_titre">';
 print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b><br>';
@@ -186,11 +186,11 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     print '<div class="formelementrow">'.$langs->trans("FullPathToMysqldumpCommand");
     if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
     {
-        $fullpathofmysqldump=$db->getPathOfDump();
+        $fullpathofmysqldump = $db->getPathOfDump();
     }
     else
     {
-        $fullpathofmysqldump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
+        $fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
     }
     print '<br>';
     print '<input type="text" name="mysqldump" style="width: 80%" value="'.$fullpathofmysqldump.'" /></div>';
@@ -203,7 +203,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 
     print '</div>';
 
-    if (! empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
+    if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
         print '<div class="formelementrow">';
         print '<input type="checkbox" name="disable_fk" value="yes" id="checkbox_disable_fk" checked />';
         print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
@@ -242,7 +242,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
     print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
     print '</legend>';
-    print '<input type="checkbox" name="drop"'.(((! isset($_GET["drop"]) && ! isset($_POST["drop"])) || GETPOST('drop'))?' checked':'').' id="checkbox_dump_drop" />';
+    print '<input type="checkbox" name="drop"'.(((!isset($_GET["drop"]) && !isset($_POST["drop"])) || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
     print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
     print '<br>';
     print '</fieldset>';
@@ -293,7 +293,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
     print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
 
     print '</div>';
-    if (! empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
+    if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
         print '<div class="formelementrow">';
         print '<input type="checkbox" name="nobin_disable_fk" value="yes" id="checkbox_disable_fk" checked />';
         print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
@@ -303,7 +303,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 
     print '<br>';
     print '<fieldset><legend>'.$langs->trans('ExportStructure').'</legend>';
-    print '<input type="checkbox" name="nobin_drop"'.((! isset($_GET["nobin_drop"]) && ! isset($_POST["nobin_drop"])) || GETPOST('nobin_drop'))?' checked':''.' id="checkbox_dump_drop" />';
+    print '<input type="checkbox" name="nobin_drop"'.((!isset($_GET["nobin_drop"]) && !isset($_POST["nobin_drop"])) || GETPOST('nobin_drop')) ? ' checked' : ''.' id="checkbox_dump_drop" />';
     print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
     print '<br>';
     print '</fieldset>';
@@ -338,11 +338,11 @@ if (in_array($type, array('pgsql'))) {
 
     print '<div class="formelementrow">'.$langs->trans("FullPathToPostgreSQLdumpCommand");
     if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
-        $fullpathofpgdump=$db->getPathOfDump();
+        $fullpathofpgdump = $db->getPathOfDump();
     }
     else
     {
-        $fullpathofpgdump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+        $fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
     }
     print '<br>';
     print '<input type="text" name="postgresqldump" style="width: 80%" value="'.$fullpathofpgdump.'" /></div>';
@@ -391,27 +391,27 @@ print '<legend>'.$langs->trans("Destination").'</legend> -->';
 print '<br>';
 print '<label for="filename_template">'.$langs->trans("FileNameToGenerate").'</label>';
 print '<br>';
-$prefix='dump';
-$ext='.sql';
+$prefix = 'dump';
+$ext = '.sql';
 if (in_array($type, array('mysql', 'mysqli'))) {
-	$prefix='mysqldump';
-	$ext='sql';
+	$prefix = 'mysqldump';
+	$ext = 'sql';
 }
 //if ($label == 'PostgreSQL') {
 //	$prefix='pg_dump';
 //	$ext='dump';
 //}
 if (in_array($type, array('pgsql'))) {
-	$prefix='pg_dump';
-	$ext='sql';
+	$prefix = 'pg_dump';
+	$ext = 'sql';
 }
-$file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
+$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
 print '<input type="text" name="filename_template" style="width: 90%" id="filename_template" value="'.$file.'" />';
 print '<br>';
 print '<br>';
 
 // Define compressions array
-$compression=array();
+$compression = array();
 if (in_array($type, array('mysql', 'mysqli'))) {
 	$compression['gz'] = array(
 		'function' => 'gzopen',
@@ -488,7 +488,7 @@ print '<input type="hidden" name="page_y" value="'.GETPOST('page_y', 'int').'">'
 print '<br>';
 print '<br>';
 
-if (! empty($_SESSION["commandbackuplastdone"]))
+if (!empty($_SESSION["commandbackuplastdone"]))
 {
     print '<br><b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
     print '<textarea rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuplastdone"].'</textarea><br>'."\n";
@@ -500,11 +500,11 @@ if (! empty($_SESSION["commandbackuplastdone"]))
     print '<b>'.$langs->trans("BackupResult").':</b> ';
 	print $_SESSION["commandbackupresult"];
 
-	$_SESSION["commandbackuplastdone"]='';
-	$_SESSION["commandbackuptorun"]='';
-	$_SESSION["commandbackupresult"]='';
+	$_SESSION["commandbackuplastdone"] = '';
+	$_SESSION["commandbackuptorun"] = '';
+	$_SESSION["commandbackupresult"] = '';
 }
-if (! empty($_SESSION["commandbackuptorun"]))
+if (!empty($_SESSION["commandbackuptorun"]))
 {
 	print '<br><font class="warning">'.$langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser", $dolibarr_main_db_user, $dolibarr_main_db_user).':</font><br>'."\n";
 	print '<textarea id="commandbackuptoruntext" rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuptorun"].'</textarea><br>'."\n";
@@ -513,9 +513,9 @@ if (! empty($_SESSION["commandbackuptorun"]))
 
 	//print $paramclear;
 
-	$_SESSION["commandbackuplastdone"]='';
-	$_SESSION["commandbackuptorun"]='';
-	$_SESSION["commandbackupresult"]='';
+	$_SESSION["commandbackuplastdone"] = '';
+	$_SESSION["commandbackuptorun"] = '';
+	$_SESSION["commandbackupresult"] = '';
 }
 
 print "</div> <!-- end div center button -->\n";
@@ -529,8 +529,8 @@ print "</div> 	<!-- end div fichehalfleft -->\n";
 print '<div id="backupdatabaseright" class="fichehalfright" style="height:480px; overflow: auto;">';
 print '<div class="ficheaddleft">';
 
-$filearray=dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '', $sortfield, (strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC), 1);
-$result=$formfile->list_of_documents($filearray, null, 'systemtools', '', 1, 'backup/', 1, 0, $langs->trans("NoBackupFileAvailable"), 0, $langs->trans("PreviousDumpFiles"));
+$filearray = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
+$result = $formfile->list_of_documents($filearray, null, 'systemtools', '', 1, 'backup/', 1, 0, $langs->trans("NoBackupFileAvailable"), 0, $langs->trans("PreviousDumpFiles"));
 print '<br>';
 
 print '</div>';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 6a92a14fba2..13ab3a1ae17 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -217,12 +217,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_type = '';
 	$search_country = '';
 	$search_type_thirdparty = '';
-	$search_date_start='';
-	$search_date_end='';
-	$search_dateend_start='';
-	$search_dateend_end='';
-	$search_datedelivery_start='';
-	$search_datedelivery_end='';
+	$search_date_start = '';
+	$search_date_end = '';
+	$search_dateend_start = '';
+	$search_dateend_end = '';
+	$search_datedelivery_start = '';
+	$search_datedelivery_end = '';
 	$search_availability = '';
 	$viewstatut = '';
 	$object_statut = '';
@@ -338,13 +338,13 @@ if ($viewstatut != '' && $viewstatut != '-1')
 {
 	$sql .= ' AND p.fk_statut IN ('.$db->escape($viewstatut).')';
 }
-if ($search_date_start)             $sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
-if ($search_date_end)               $sql .= " AND p.datep <= '" . $db->idate($search_date_end) . "'";
-if ($search_dateend_start)      	$sql .= " AND p.fin_validite >= '" . $db->idate($search_dateend_start) . "'";
-if ($search_dateend_end)            $sql .= " AND p.fin_validite <= '" . $db->idate($search_dateend_end) . "'";
-if ($search_datedelivery_start)     $sql .= " AND p.date_livraison >= '" . $db->idate($search_datedelivery_start) . "'";
-if ($search_datedelivery_end)       $sql .= " AND p.date_livraison <= '" . $db->idate($search_datedelivery_end) . "'";
-if ($search_sale > 0)				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$db->escape($search_sale);
+if ($search_date_start)             $sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";
+if ($search_date_end)               $sql .= " AND p.datep <= '".$db->idate($search_date_end)."'";
+if ($search_dateend_start)      	$sql .= " AND p.fin_validite >= '".$db->idate($search_dateend_start)."'";
+if ($search_dateend_end)            $sql .= " AND p.fin_validite <= '".$db->idate($search_dateend_end)."'";
+if ($search_datedelivery_start)     $sql .= " AND p.date_livraison >= '".$db->idate($search_datedelivery_start)."'";
+if ($search_datedelivery_end)       $sql .= " AND p.date_livraison <= '".$db->idate($search_datedelivery_end)."'";
+if ($search_sale > 0)				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
 if ($search_user > 0)
 {
 	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$db->escape($search_user);
@@ -599,12 +599,12 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From') . ' ';
-		print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1);
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to') . ' ';
-		print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1);
+		print $langs->trans('to').' ';
+		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}
@@ -613,12 +613,12 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From') . ' ';
-		print $form->selectDate($search_dateend_start?$search_dateend_start:-1, 'search_dateend_start', 0, 0, 1);
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to') . ' ';
-		print $form->selectDate($search_dateend_end?$search_dateend_end:-1, 'search_dateend_end', 0, 0, 1);
+		print $langs->trans('to').' ';
+		print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}
@@ -627,12 +627,12 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From') . ' ';
-		print $form->selectDate($search_datedelivery_start?$search_datedelivery_start:-1, 'search_datedelivery_start', 0, 0, 1);
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to') . ' ';
-		print $form->selectDate($search_datedelivery_end?$search_datedelivery_end:-1, 'search_datedelivery_end', 0, 0, 1);
+		print $langs->trans('to').' ';
+		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index bcf93c6c10f..ffc44066fba 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -195,10 +195,10 @@ if (empty($reshook))
 		$search_total_ht = '';
 		$search_total_vat = '';
 		$search_total_ttc = '';
-		$search_dateorder_start ='';
-		$search_dateorder_end ='';
-		$search_datedelivery_start ='';
-		$search_datedelivery_end ='';
+		$search_dateorder_start = '';
+		$search_dateorder_end = '';
+		$search_datedelivery_start = '';
+		$search_datedelivery_end = '';
 		$search_project_ref = '';
 		$search_project = '';
 		$viewstatut = '';
@@ -308,10 +308,10 @@ if ($viewstatut <> '')
 	}
 }
 
-if ($search_dateorder_start)        $sql .= " AND c.date_commande >= '" . $db->idate($search_dateorder_start) . "'";
-if ($search_dateorder_end)          $sql .= " AND c.date_commande <= '" . $db->idate($search_dateorder_end) . "'";
-if ($search_datedelivery_start)		$sql .= " AND c.date_livraison >= '" . $db->idate($search_datedelivery_start) . "'";
-if ($search_datedelivery_end)		$sql .= " AND c.date_livraison <= '" . $db->idate($search_datedelivery_end) . "'";
+if ($search_dateorder_start)        $sql .= " AND c.date_commande >= '".$db->idate($search_dateorder_start)."'";
+if ($search_dateorder_end)          $sql .= " AND c.date_commande <= '".$db->idate($search_dateorder_end)."'";
+if ($search_datedelivery_start)		$sql .= " AND c.date_livraison >= '".$db->idate($search_datedelivery_start)."'";
+if ($search_datedelivery_end)		$sql .= " AND c.date_livraison <= '".$db->idate($search_datedelivery_end)."'";
 if ($search_town)					$sql .= natural_search('s.town', $search_town);
 if ($search_zip)					$sql .= natural_search("s.zip", $search_zip);
 if ($search_state)					$sql .= natural_search("state.nom", $search_state);
@@ -646,12 +646,12 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From') . ' ';
-		print $form->selectDate($search_dateorder_start?$search_dateorder_start:-1, 'search_dateorder_start', 0, 0, 1);
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to') . ' ';
-		print $form->selectDate($search_dateorder_end?$search_dateorder_end:-1, 'search_dateorder_end', 0, 0, 1);
+		print $langs->trans('to').' ';
+		print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}
@@ -659,12 +659,12 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From') . ' ';
-		print $form->selectDate($search_datedelivery_start?$search_datedelivery_start:-1, 'search_datedelivery_start', 0, 0, 1);
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to') . ' ';
-		print $form->selectDate($search_datedelivery_end?$search_datedelivery_end:-1, 'search_datedelivery_end', 0, 0, 1);
+		print $langs->trans('to').' ';
+		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}
@@ -826,7 +826,7 @@ if ($resql)
 		{
 			print '<td class="nowrap">';
 
-			$generic_commande->getLinesArray();		// This set ->lines
+			$generic_commande->getLinesArray(); // This set ->lines
 
 			print $generic_commande->getNomUrl(1, ($viewstatut != 2 ? 0 : $obj->fk_statut), 0, 0, 0, 1, 1);
 
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index c4164c78b4a..a49b217896d 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -31,16 +31,16 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta","banks","bills","accountancy"));
+$langs->loadLangs(array("compta", "banks", "bills", "accountancy"));
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'banque', '', '', '');
 
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $search_ref = GETPOST('search_ref', 'int');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -61,38 +61,38 @@ if (empty($page) || $page == -1) { $page = 0; }	 // If $page is not defined, or
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortfield) $sortfield="v.datep,v.rowid";
-if (! $sortorder) $sortorder="DESC";
+if (!$sortfield) $sortfield = "v.datep,v.rowid";
+if (!$sortorder) $sortorder = "DESC";
 
-$filtre=GETPOST("filtre", 'alpha');
+$filtre = GETPOST("filtre", 'alpha');
 
-if (! GETPOST('typeid'))
+if (!GETPOST('typeid'))
 {
-	$newfiltre=str_replace('filtre=', '', $filtre);
-	$filterarray=explode('-', $newfiltre);
-	foreach($filterarray as $val)
+	$newfiltre = str_replace('filtre=', '', $filtre);
+	$filterarray = explode('-', $newfiltre);
+	foreach ($filterarray as $val)
 	{
-		$part=explode(':', $val);
-		if ($part[0] == 'v.fk_typepayment') $typeid=$part[1];
+		$part = explode(':', $val);
+		if ($part[0] == 'v.fk_typepayment') $typeid = $part[1];
 	}
 }
 else
 {
-	$typeid=GETPOST('typeid');
+	$typeid = GETPOST('typeid');
 }
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
 {
-	$search_ref="";
-	$search_label="";
-	$search_date_start='';
-	$search_date_end='';
-	$search_amount_deb="";
-	$search_amount_cred="";
-	$search_account='';
+	$search_ref = "";
+	$search_label = "";
+	$search_date_start = '';
+	$search_date_end = '';
+	$search_amount_deb = "";
+	$search_amount_cred = "";
+	$search_account = '';
 	$search_accountancy_account = '';
 	$search_accountancy_subledger = '';
-	$typeid="";
+	$typeid = "";
 }
 
 /*
@@ -107,62 +107,62 @@ $variousstatic = new PaymentVarious($db);
 $accountstatic = new Account($db);
 
 $sql = "SELECT v.rowid, v.sens, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank, v.accountancy_code, v.subledger_account,";
-$sql.= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number as bank_account_number, ba.fk_accountancy_journal as accountancy_journal, ba.label as blabel,";
-$sql.= " pst.code as payment_code";
-$sql.= " FROM ".MAIN_DB_PREFIX."payment_various as v";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-$sql.= " WHERE v.entity IN (".getEntity('payment_various').")";
+$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number as bank_account_number, ba.fk_accountancy_journal as accountancy_journal, ba.label as blabel,";
+$sql .= " pst.code as payment_code";
+$sql .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON v.fk_typepayment = pst.id";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON v.fk_bank = b.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+$sql .= " WHERE v.entity IN (".getEntity('payment_various').")";
 
 // Search criteria
-if ($search_ref)						$sql.= " AND v.rowid=".$db->escape($search_ref);
-if ($search_label)						$sql.= natural_search(array('v.label'), $search_label);
-if ($search_date_start)					$sql.= " AND v.datep >= '" . $db->idate($search_date_start) . "'";
-if ($search_date_end)           	    $sql.= " AND v.datep <= '" . $db->idate($search_date_end) . "'";
-if ($search_amount_deb)					$sql.= natural_search("v.amount", $search_amount_deb, 1);
-if ($search_amount_cred)				$sql.= natural_search("v.amount", $search_amount_cred, 1);
-if ($search_account > 0)				$sql.= " AND b.fk_account=".$db->escape($search_account);
-if ($search_accountancy_account > 0)	$sql.= " AND v.accountancy_code=".$db->escape($search_accountancy_account);
-if ($search_accountancy_subledger > 0)	$sql.= " AND v.subledger_account=".$db->escape($search_accountancy_subledger);
-if ($typeid > 0)						$sql.= " AND v.fk_typepayment=".$typeid;
+if ($search_ref)						$sql .= " AND v.rowid=".$db->escape($search_ref);
+if ($search_label)						$sql .= natural_search(array('v.label'), $search_label);
+if ($search_date_start)					$sql .= " AND v.datep >= '".$db->idate($search_date_start)."'";
+if ($search_date_end)           	    $sql .= " AND v.datep <= '".$db->idate($search_date_end)."'";
+if ($search_amount_deb)					$sql .= natural_search("v.amount", $search_amount_deb, 1);
+if ($search_amount_cred)				$sql .= natural_search("v.amount", $search_amount_cred, 1);
+if ($search_account > 0)				$sql .= " AND b.fk_account=".$db->escape($search_account);
+if ($search_accountancy_account > 0)	$sql .= " AND v.accountancy_code=".$db->escape($search_accountancy_account);
+if ($search_accountancy_subledger > 0)	$sql .= " AND v.subledger_account=".$db->escape($search_accountancy_subledger);
+if ($typeid > 0)						$sql .= " AND v.fk_typepayment=".$typeid;
 if ($filtre) {
-	$filtre=str_replace(":", "=", $filtre);
+	$filtre = str_replace(":", "=", $filtre);
 	$sql .= " AND ".$filtre;
 }
 
-$sql.= $db->order($sortfield, $sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
-$totalnboflines=0;
-$result=$db->query($sql);
+$totalnboflines = 0;
+$result = $db->query($sql);
 if ($result)
 {
 	$totalnboflines = $db->num_rows($result);
 }
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
 if ($result)
 {
 	$num = $db->num_rows($result);
 	$i = 0;
-	$total = 0 ;
+	$total = 0;
 
-	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($search_ref)						$param.='&search_ref='.urlencode($search_ref);
-	if ($search_label)						$param.='&search_label='.urlencode($search_label);
-	if ($search_date_start)					$param.='&search_date_start='.urlencode($search_date_start);
-	if ($search_date_end)					$param.='&search_date_end='.urlencode($search_date_end);
-	if ($typeid > 0)            			$param.='&typeid='.urlencode($typeid);
-	if ($search_amount_deb)     			$param.='&search_amount_deb='.urlencode($search_amount_deb);
-	if ($search_amount_cred)    			$param.='&search_amount_cred='.urlencode($search_amount_cred);
-	if ($search_account > 0)				$param.='&search_amount='.urlencode($search_account);
-	if ($search_accountancy_account > 0)	$param.='&search_accountancy_account='.urlencode($search_accountancy_account);
-	if ($search_accountancy_subledger > 0)	$param.='&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($search_ref)						$param .= '&search_ref='.urlencode($search_ref);
+	if ($search_label)						$param .= '&search_label='.urlencode($search_label);
+	if ($search_date_start)					$param .= '&search_date_start='.urlencode($search_date_start);
+	if ($search_date_end)					$param .= '&search_date_end='.urlencode($search_date_end);
+	if ($typeid > 0)            			$param .= '&typeid='.urlencode($typeid);
+	if ($search_amount_deb)     			$param .= '&search_amount_deb='.urlencode($search_amount_deb);
+	if ($search_amount_cred)    			$param .= '&search_amount_cred='.urlencode($search_amount_cred);
+	if ($search_account > 0)				$param .= '&search_amount='.urlencode($search_account);
+	if ($search_accountancy_account > 0)	$param .= '&search_accountancy_account='.urlencode($search_accountancy_account);
+	if ($search_accountancy_subledger > 0)	$param .= '&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
 
-	if ($optioncss != '') $param.='&amp;optioncss='.urlencode($optioncss);
+	if ($optioncss != '') $param .= '&amp;optioncss='.urlencode($optioncss);
 
 	$newcardbutton = '';
 	if ($user->rights->banque->modifier)
@@ -198,12 +198,12 @@ if ($result)
 	// Date
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From') . ' ';
-	print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1);
+	print $langs->trans('From').' ';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to') . ' ';
-	print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1);
+	print $langs->trans('to').' ';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
 
 	print '</div>';
 	print '</td>';
@@ -227,14 +227,14 @@ if ($result)
 		// Accounting account
 		print '<td class="liste_titre">';
 		print '<div class="nowrap">';
-		print $formaccounting->select_account($search_accountancy_account, 'search_accountancy_account', 1, array (), 1, 1, 'maxwidth200');
+		print $formaccounting->select_account($search_accountancy_account, 'search_accountancy_account', 1, array(), 1, 1, 'maxwidth200');
 		print '</div>';
 		print '</td>';
 
 		// Subledger account
 		print '<td class="liste_titre">';
 		print '<div class="nowrap">';
-		print $formaccounting->select_auxaccount($search_accountancy_subledger, 'search_accountancy_subledger', 1, array (), 1, 1, 'maxwidth200');
+		print $formaccounting->select_auxaccount($search_accountancy_subledger, 'search_accountancy_subledger', 1, array(), 1, 1, 'maxwidth200');
 		print '</div>';
 		print '</td>';
 	}
@@ -246,7 +246,7 @@ if ($result)
 	print '<td class="liste_titre right"><input name="search_amount_cred" class="flat" type="text" size="8" value="'.$search_amount_cred.'"></td>';
 
 	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
 	print $searchpicto;
 	print '</td>';
 
@@ -258,9 +258,9 @@ if ($result)
 	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "v.label", "", $param, '', $sortfield, $sortorder, 'left ');
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "v.datep,v.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'left ');
-	if (! empty($conf->banque->enabled))     print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-	if (! empty($conf->accounting->enabled)) print_liste_field_titre("AccountAccountingShort", $_SERVER["PHP_SELF"], "v.accountancy_code", "", $param, '', $sortfield, $sortorder, 'left ');
-	if (! empty($conf->accounting->enabled)) print_liste_field_titre("SubledgerAccount", $_SERVER["PHP_SELF"], "v.subledger_account", "", $param, '', $sortfield, $sortorder, 'left ');
+	if (!empty($conf->banque->enabled))     print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+	if (!empty($conf->accounting->enabled)) print_liste_field_titre("AccountAccountingShort", $_SERVER["PHP_SELF"], "v.accountancy_code", "", $param, '', $sortfield, $sortorder, 'left ');
+	if (!empty($conf->accounting->enabled)) print_liste_field_titre("SubledgerAccount", $_SERVER["PHP_SELF"], "v.subledger_account", "", $param, '', $sortfield, $sortorder, 'left ');
 	print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "v.amount", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "v.amount", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
@@ -279,19 +279,19 @@ if ($result)
 
 		// Ref
 		print "<td>".$variousstatic->getNomUrl(1)."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
 		// Label payment
 		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
 		// Date payment
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
 		// Type
 		print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
 		// Account
 		if (!empty($conf->banque->enabled))
@@ -316,7 +316,7 @@ if ($result)
 			}
 			else print '&nbsp;';
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Accounting account
@@ -325,14 +325,14 @@ if ($result)
 			$accountingaccount->fetch('', $obj->accountancy_code, 1);
 
 			print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Accounting subledger account
-		if (! empty($conf->accounting->enabled))
+		if (!empty($conf->accounting->enabled))
 		{
-			print '<td>' . length_accounta($obj->subledger_account) . '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			print '<td>'.length_accounta($obj->subledger_account).'</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Debit
@@ -342,8 +342,8 @@ if ($result)
 			print price($obj->amount);
 			$totalarray['val']['total_deb'] += $obj->amount;
 		}
-		if (! $i) $totalarray['nbfield']++;
-		if (! $i) $totalarray['pos'][$totalarray['nbfield']]='total_deb';
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_deb';
 		print '</td>';
 
 		// Credit
@@ -353,12 +353,12 @@ if ($result)
 			print price($obj->amount);
 			$totalarray['val']['total_cred'] += $obj->amount;
 		}
-		if (! $i) $totalarray['nbfield']++;
-		if (! $i) $totalarray['pos'][$totalarray['nbfield']]='total_cred';
-		print '</td>' ;
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_cred';
+		print '</td>';
 		print '<td></td>';
 
-		if (! $i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['nbfield']++;
 
 		print "</tr>\n";
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8e34eaede11..4fa3d256f14 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -480,10 +480,10 @@ if ($search_paymentmode > 0)  $sql .= " AND f.fk_mode_reglement = ".$db->escape(
 if ($search_paymentterms > 0) $sql .= " AND f.fk_cond_reglement = ".$db->escape($search_paymentterms);
 if ($search_module_source)    $sql .= natural_search("f.module_source", $search_module_source);
 if ($search_pos_source)       $sql .= natural_search("f.pos_source", $search_pos_source);
-if ($search_date_start)       $sql .= " AND f.datef >= '" . $db->idate($search_date_start) . "'";
-if ($search_date_end)         $sql .= " AND f.datef <= '" . $db->idate($search_date_end) . "'";
-if ($search_datelimit_start)  $sql .= " AND f.date_lim_reglement >= '" . $db->idate($search_datelimit_start) . "'";
-if ($search_datelimit_end)    $sql .= " AND f.date_lim_reglement <= '" . $db->idate($search_datelimit_end) . "'";
+if ($search_date_start)       $sql .= " AND f.datef >= '".$db->idate($search_date_start)."'";
+if ($search_date_end)         $sql .= " AND f.datef <= '".$db->idate($search_date_end)."'";
+if ($search_datelimit_start)  $sql .= " AND f.date_lim_reglement >= '".$db->idate($search_datelimit_start)."'";
+if ($search_datelimit_end)    $sql .= " AND f.date_lim_reglement <= '".$db->idate($search_datelimit_end)."'";
 if ($option == 'late') $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
 if ($search_sale > 0)  $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".(int) $search_sale;
 if ($search_user > 0)
@@ -752,12 +752,12 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From') . ' ';
-		print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1);
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to') . ' ';
-		print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1);
+		print $langs->trans('to').' ';
+		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}
@@ -766,12 +766,12 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From') . ' ';
-		print $form->selectDate($search_datelimit_start?$search_datelimit_start:-1, 'search_datelimit_start', 0, 0, 1);
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_datelimit_start ? $search_datelimit_start : -1, 'search_datelimit_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to') . ' ';
-		print $form->selectDate($search_datelimit_end?$search_datelimit_end:-1, 'search_datelimit_end', 0, 0, 1);
+		print $langs->trans('to').' ';
+		print $form->selectDate($search_datelimit_end ? $search_datelimit_end : -1, 'search_datelimit_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 601368f6632..d954ba08320 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1135,7 +1135,7 @@ class DolGraph
     public function total()
 	{
 		$value = 0;
-		foreach($this->data as $valarray)	// Loop on each x
+		foreach ($this->data as $valarray)	// Loop on each x
 			{
 			$value += $valarray[1];
 		}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2c2064a0619..453ed09a6f7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5910,7 +5910,7 @@ class Form
 		//var_dump($objecttmp->filter);
 		$prefixforautocompletemode = $objecttmp->element;
 		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode = 'company';
-		if ($prefixforautocompletemode == 'product') $prefixforautocompletemode='produit';
+		if ($prefixforautocompletemode == 'product') $prefixforautocompletemode = 'produit';
 		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT
 
 		dol_syslog(get_class($this)."::selectForForms object->filter=".$objecttmp->filter, LOG_DEBUG);
@@ -7864,7 +7864,7 @@ class Form
 	 */
     public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
@@ -7873,16 +7873,16 @@ class Form
 			$usertofilter = $user;
 		}
 
-		$out='';
+		$out = '';
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		if (empty($projectsListId))
 		{
 			if (empty($usertofilter->rights->projet->all->lire))
 			{
-				$projectstatic=new Project($this->db);
+				$projectstatic = new Project($this->db);
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1);
 			}
 		}
@@ -7890,37 +7890,37 @@ class Form
 		// Search all projects
         $sql = 'SELECT f.rowid, f.ref as fref, "nolabel" as flabel, p.rowid as pid, f.ref,
             p.title, p.fk_soc, p.fk_statut, p.public,';
-		$sql.= ' s.nom as name';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
-		$sql.= ' '.MAIN_DB_PREFIX.'facture as f';
-		$sql.= " WHERE p.entity IN (".getEntity('project').")";
-		$sql.= " AND f.fk_projet = p.rowid AND f.fk_statut=0"; //Brouillons seulement
+		$sql .= ' s.nom as name';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
+		$sql .= ' '.MAIN_DB_PREFIX.'facture as f';
+		$sql .= " WHERE p.entity IN (".getEntity('project').")";
+		$sql .= " AND f.fk_projet = p.rowid AND f.fk_statut=0"; //Brouillons seulement
 		//if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
 		//if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		//if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		$sql.= " GROUP BY f.ref ORDER BY p.ref, f.ref ASC";
+		$sql .= " GROUP BY f.ref ORDER BY p.ref, f.ref ASC";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			// Use select2 selector
-			if (! empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
-            	$out.=$comboenhancement;
-            	$morecss='minwidth200imp maxwidth500';
+            	$out .= $comboenhancement;
+            	$morecss = 'minwidth200imp maxwidth500';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="valignmiddle flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'">';
+				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlname.'" name="'.$htmlname.'">';
 			}
-			if (! empty($show_empty)) {
-				$out.= '<option value="0" class="optiongrey">';
-				if (! is_numeric($show_empty)) $out.=$show_empty;
-				else $out.='&nbsp;';
-				$out.= '</option>';
+			if (!empty($show_empty)) {
+				$out .= '<option value="0" class="optiongrey">';
+				if (!is_numeric($show_empty)) $out .= $show_empty;
+				else $out .= '&nbsp;';
+				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -7946,57 +7946,57 @@ class Form
 
 						if ($showproject == 'all')
 						{
-							$labeltoshow.=dol_trunc($obj->ref, 18);     // Invoice ref
-							if ($obj->name) $labeltoshow.=' - '.$obj->name; // Soc name
+							$labeltoshow .= dol_trunc($obj->ref, 18); // Invoice ref
+							if ($obj->name) $labeltoshow .= ' - '.$obj->name; // Soc name
 
-							$disabled=0;
+							$disabled = 0;
 							if ($obj->fk_statut == Project::STATUS_DRAFT)
 							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("Draft");
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("Draft");
 							}
 							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
-								if ($discard_closed == 2) $disabled=1;
-								$labeltoshow.=' - '.$langs->trans("Closed");
+								if ($discard_closed == 2) $disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("Closed");
 							}
-							elseif ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 						}
 
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
-							$out.= '<option value="'.$obj->rowid.'" selected';
+							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out.= '>'.$labeltoshow.'</option>';
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 						else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>';
-								$resultat.=$labeltoshow;
-								$resultat.='</option>';
+								$resultat .= '>';
+								$resultat .= $labeltoshow;
+								$resultat .= '</option>';
 							}
-							$out.= $resultat;
+							$out .= $resultat;
 						}
 					}
 					$i++;
 				}
 			}
 			if (empty($option_only)) {
-				$out.= '</select>';
+				$out .= '</select>';
 			}
 
 			print $out;
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 2ac64565e9c..7904d27d17a 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -493,7 +493,7 @@ class Utils
 		}
 
 		// Clean old files
-		if (! $errormsg && $keeplastnfiles > 0)
+		if (!$errormsg && $keeplastnfiles > 0)
 		{
 			$tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
 			$i = 0;
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 861017b2844..278e53eef6e 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -85,7 +85,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     /**
      * @var string    Module position on 2 digits
      */
-    public $module_position='50';
+    public $module_position = '50';
 
     /**
      * @var string Module name
@@ -222,9 +222,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
     public $export_permission;
     public $export_fields_array;
-    public $export_TypeFields_array;		// Array of key=>type where type can be 'Numeric', 'Date', 'Text', 'Boolean', 'Status', 'List:xxx:login:rowid'
+    public $export_TypeFields_array; // Array of key=>type where type can be 'Numeric', 'Date', 'Text', 'Boolean', 'Status', 'List:xxx:login:rowid'
     public $export_entities_array;
-    public $export_special_array;           // special or computed field
+    public $export_special_array; // special or computed field
     public $export_dependencies_array;
     public $export_sql_start;
     public $export_sql_end;
@@ -367,75 +367,75 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     {
         // phpcs:enable
         global $conf;
-        $err=0;
+        $err = 0;
 
         $this->db->begin();
 
         // Insert activation module constant
-        if (! $err) {
-            $err+=$this->_active();
+        if (!$err) {
+            $err += $this->_active();
         }
 
         // Insert new pages for tabs (into llx_const)
-        if (! $err) {
-            $err+=$this->insert_tabs();
+        if (!$err) {
+            $err += $this->insert_tabs();
         }
 
         // Insert activation of module's parts
-        if (! $err) {
-            $err+=$this->insert_module_parts();
+        if (!$err) {
+            $err += $this->insert_module_parts();
         }
 
         // Insert constant defined by modules (into llx_const)
-        if (! $err && ! preg_match('/newboxdefonly/', $options)) {
-            $err+=$this->insert_const();    // Test on newboxdefonly to avoid to erase value during upgrade
+        if (!$err && !preg_match('/newboxdefonly/', $options)) {
+            $err += $this->insert_const(); // Test on newboxdefonly to avoid to erase value during upgrade
         }
 
         // Insert boxes def into llx_boxes_def and boxes setup (into llx_boxes)
-        if (! $err && ! preg_match('/noboxes/', $options)) {
-            $err+=$this->insert_boxes($options);
+        if (!$err && !preg_match('/noboxes/', $options)) {
+            $err += $this->insert_boxes($options);
         }
 
         // Insert cron job entries (entry in llx_cronjobs)
-        if (! $err) {
-            $err+=$this->insert_cronjobs();
+        if (!$err) {
+            $err += $this->insert_cronjobs();
         }
 
         // Insert permission definitions of module into llx_rights_def. If user is admin, grant this permission to user.
-        if (! $err) {
-            $err+=$this->insert_permissions(1, null, 1);
+        if (!$err) {
+            $err += $this->insert_permissions(1, null, 1);
         }
 
         // Insert specific menus entries into database
-        if (! $err) {
-            $err+=$this->insert_menus();
+        if (!$err) {
+            $err += $this->insert_menus();
         }
 
         // Create module's directories
-        if (! $err) {
-            $err+=$this->create_dirs();
+        if (!$err) {
+            $err += $this->create_dirs();
         }
 
         // Execute addons requests
-        $num=count($array_sql);
+        $num = count($array_sql);
         for ($i = 0; $i < $num; $i++)
         {
-            if (! $err) {
-                $val=$array_sql[$i];
-                $sql=$val;
-                $ignoreerror=0;
+            if (!$err) {
+                $val = $array_sql[$i];
+                $sql = $val;
+                $ignoreerror = 0;
                 if (is_array($val)) {
-                    $sql=$val['sql'];
-                    $ignoreerror=$val['ignoreerror'];
+                    $sql = $val['sql'];
+                    $ignoreerror = $val['ignoreerror'];
                 }
                 // Add current entity id
-                $sql=str_replace('__ENTITY__', $conf->entity, $sql);
+                $sql = str_replace('__ENTITY__', $conf->entity, $sql);
 
                 dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror."", LOG_DEBUG);
-                $result=$this->db->query($sql, $ignoreerror);
-                if (! $result) {
-                    if (! $ignoreerror) {
-                         $this->error=$this->db->lasterror();
+                $result = $this->db->query($sql, $ignoreerror);
+                if (!$result) {
+                    if (!$ignoreerror) {
+                         $this->error = $this->db->lasterror();
                          $err++;
                     }
                     else
@@ -447,7 +447,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         }
 
         // Return code
-        if (! $err) {
+        if (!$err) {
             $this->db->commit();
             return 1;
         }
@@ -470,71 +470,71 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     protected function _remove($array_sql, $options = '')
     {
         // phpcs:enable
-        $err=0;
+        $err = 0;
 
         $this->db->begin();
 
         // Remove activation module line (constant MAIN_MODULE_MYMODULE in llx_const)
-        if (! $err) {
-            $err+=$this->_unactive();
+        if (!$err) {
+            $err += $this->_unactive();
         }
 
         // Remove activation of module's new tabs (MAIN_MODULE_MYMODULE_TABS_XXX in llx_const)
-        if (! $err) {
-            $err+=$this->delete_tabs();
+        if (!$err) {
+            $err += $this->delete_tabs();
         }
 
         // Remove activation of module's parts (MAIN_MODULE_MYMODULE_XXX in llx_const)
-        if (! $err) {
-            $err+=$this->delete_module_parts();
+        if (!$err) {
+            $err += $this->delete_module_parts();
         }
 
         // Remove constants defined by modules
-        if (! $err) {
-            $err+=$this->delete_const();
+        if (!$err) {
+            $err += $this->delete_const();
         }
 
         // Remove list of module's available boxes (entry in llx_boxes)
-        if (! $err && ! preg_match('/(newboxdefonly|noboxes)/', $options)) {
-            $err+=$this->delete_boxes();    // We don't have to delete if option ask to keep boxes safe or ask to add new box def only
+        if (!$err && !preg_match('/(newboxdefonly|noboxes)/', $options)) {
+            $err += $this->delete_boxes(); // We don't have to delete if option ask to keep boxes safe or ask to add new box def only
         }
 
         // Remove list of module's cron job entries (entry in llx_cronjobs)
-        if (! $err) {
-            $err+=$this->delete_cronjobs();
+        if (!$err) {
+            $err += $this->delete_cronjobs();
         }
 
         // Remove module's permissions from list of available permissions (entries in llx_rights_def)
-        if (! $err) {
-            $err+=$this->delete_permissions();
+        if (!$err) {
+            $err += $this->delete_permissions();
         }
 
         // Remove module's menus (entries in llx_menu)
-        if (! $err) {
-            $err+=$this->delete_menus();
+        if (!$err) {
+            $err += $this->delete_menus();
         }
 
         // Remove module's directories
-        if (! $err) {
-            $err+=$this->delete_dirs();
+        if (!$err) {
+            $err += $this->delete_dirs();
         }
 
         // Run complementary sql requests
-        $num=count($array_sql);
+        $num = count($array_sql);
         for ($i = 0; $i < $num; $i++)
         {
-            if (! $err) {
+            if (!$err) {
                 dol_syslog(get_class($this)."::_remove", LOG_DEBUG);
-                $result=$this->db->query($array_sql[$i]);
-                if (! $result) {
-                    $this->error=$this->db->error();
+                $result = $this->db->query($array_sql[$i]);
+                if (!$result) {
+                    $this->error = $this->db->error();
                     $err++;
                 }
             }
         }
 
         // Return code
-        if (! $err) {
+        if (!$err) {
             $this->db->commit();
             return 1;
         }
@@ -565,7 +565,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         {
             // If module name translation using it's unique id does not exist, we try to use its name to find translation
             if (is_array($this->langfiles)) {
-                foreach($this->langfiles as $val)
+                foreach ($this->langfiles as $val)
                 {
                     if ($val) { $langs->load($val);
                     }
@@ -601,7 +601,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         {
             // If module description translation does not exist using its unique id, we can use its name to find translation
             if (is_array($this->langfiles)) {
-                foreach($this->langfiles as $val)
+                foreach ($this->langfiles as $val)
                 {
                     if ($val) { $langs->load($val);
                     }
@@ -659,9 +659,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         else
         {
             // Mostly for internal modules
-            if (! empty($this->descriptionlong)) {
+            if (!empty($this->descriptionlong)) {
                 if (is_array($this->langfiles)) {
-                    foreach($this->langfiles as $val)
+                    foreach ($this->langfiles as $val)
                     {
                         if ($val) { $langs->load($val);
                         }
@@ -684,7 +684,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     {
         global $langs;
 
-        $filefound= false;
+        $filefound = false;
 
         // Define path to file README.md.
         // First check README-la_LA.md then README-la.md then README.md
@@ -692,21 +692,21 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (dol_is_file($pathoffile)) {
             $filefound = true;
         }
-        if (! $filefound) {
-            $tmp=explode('_', $langs->defaultlang);
+        if (!$filefound) {
+            $tmp = explode('_', $langs->defaultlang);
             $pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$tmp[0].'.md', 0);
             if (dol_is_file($pathoffile)) {
                 $filefound = true;
             }
         }
-        if (! $filefound) {
+        if (!$filefound) {
             $pathoffile = dol_buildpath(strtolower($this->name).'/README.md', 0);
             if (dol_is_file($pathoffile)) {
                 $filefound = true;
             }
         }
 
-        return ($filefound?$pathoffile:'');
+        return ($filefound ? $pathoffile : '');
     }
 
 
@@ -723,7 +723,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-        $filefound= false;
+        $filefound = false;
 
         // Define path to file README.md.
         // First check ChangeLog-la_LA.md then ChangeLog.md
@@ -731,7 +731,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if (dol_is_file($pathoffile)) {
             $filefound = true;
         }
-        if (! $filefound) {
+        if (!$filefound) {
             $pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog.md', 0);
             if (dol_is_file($pathoffile)) {
                 $filefound = true;
@@ -788,23 +788,23 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         global $langs;
         $langs->load("admin");
 
-        $ret='';
+        $ret = '';
 
-        $newversion=preg_replace('/_deprecated/', '', $this->version);
+        $newversion = preg_replace('/_deprecated/', '', $this->version);
         if ($newversion == 'experimental') {
-            $ret=($translated?$langs->transnoentitiesnoconv("VersionExperimental"):$newversion);
+            $ret = ($translated ? $langs->transnoentitiesnoconv("VersionExperimental") : $newversion);
         } elseif ($newversion == 'development') {
-            $ret=($translated?$langs->transnoentitiesnoconv("VersionDevelopment"):$newversion);
+            $ret = ($translated ? $langs->transnoentitiesnoconv("VersionDevelopment") : $newversion);
         } elseif ($newversion == 'dolibarr') {
-            $ret=DOL_VERSION;
+            $ret = DOL_VERSION;
         } elseif ($newversion) {
-            $ret=$newversion;
+            $ret = $newversion;
         } else {
-            $ret=($translated?$langs->transnoentitiesnoconv("VersionUnknown"):'unknown');
+            $ret = ($translated ? $langs->transnoentitiesnoconv("VersionUnknown") : 'unknown');
         }
 
         if (preg_match('/_deprecated/', $this->version)) {
-            $ret.=($translated?' ('.$langs->transnoentitiesnoconv("Deprecated").')':$this->version);
+            $ret .= ($translated ? ' ('.$langs->transnoentitiesnoconv("Deprecated").')' : $this->version);
         }
         return $ret;
     }
@@ -820,10 +820,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         if ($this->version == 'dolibarr' || $this->version == 'dolibarr_deprecated') {
             return 'core';
         }
-        if (! empty($this->version) && ! in_array($this->version, array('experimental','development'))) {
+        if (!empty($this->version) && !in_array($this->version, array('experimental', 'development'))) {
             return 'external';
         }
-        if (! empty($this->editor_name) || ! empty($this->editor_url)) {
+        if (!empty($this->editor_name) || !empty($this->editor_url)) {
             return 'external';
         }
         if ($this->numero >= 100000) {
@@ -854,7 +854,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     {
         global $langs;
 
-        $langstring="ExportDataset_".$this->export_code[$r];
+        $langstring = "ExportDataset_".$this->export_code[$r];
         if ($langs->trans($langstring) == $langstring) {
             // Translation not found
             return $langs->trans($this->export_label[$r]);
@@ -878,7 +878,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     {
         global $langs;
 
-        $langstring="ImportDataset_".$this->import_code[$r];
+        $langstring = "ImportDataset_".$this->import_code[$r];
         //print "x".$langstring;
         if ($langs->trans($langstring) == $langstring) {
             // Translation not found
@@ -904,18 +904,18 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         $err = 0;
 
         $sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql.= " AND entity IN (0, ".$conf->entity.")";
+        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+        $sql .= " AND entity IN (0, ".$conf->entity.")";
 
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql)
+        $resql = $this->db->query($sql);
+        if (!$resql)
         {
             $err++;
         }
         else
         {
-            $obj=$this->db->fetch_object($resql);
+            $obj = $this->db->fetch_object($resql);
             if ($obj) {
                 return $this->db->jdate($obj->tms);
             }
@@ -937,21 +937,21 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         $err = 0;
 
 		$sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
-		$sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-		$sql.= " AND entity IN (0, ".$conf->entity.")";
+		$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+		$sql .= " AND entity IN (0, ".$conf->entity.")";
 
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql)
+        $resql = $this->db->query($sql);
+        if (!$resql)
         {
             $err++;
         }
         else
         {
-            $obj=$this->db->fetch_object($resql);
-            $tmp=array();
+            $obj = $this->db->fetch_object($resql);
+            $tmp = array();
             if ($obj->note) {
-                $tmp=json_decode($obj->note, true);
+                $tmp = json_decode($obj->note, true);
             }
             if ($obj) {
                 return array('authorid'=>$tmp['authorid'], 'ip'=>$tmp['ip'], 'lastactivationdate'=>$this->db->jdate($obj->tms));
@@ -976,29 +976,29 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         $err = 0;
 
         // Common module
-        $entity = ((! empty($this->always_enabled) || ! empty($this->core_enabled)) ? 0 : $conf->entity);
+        $entity = ((!empty($this->always_enabled) || !empty($this->core_enabled)) ? 0 : $conf->entity);
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql.= " AND entity IN (0, ".$entity.")";
+        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+        $sql .= " AND entity IN (0, ".$entity.")";
 
         dol_syslog(get_class($this)."::_active delete activation constant", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) {
+        $resql = $this->db->query($sql);
+        if (!$resql) {
             $err++;
         }
 
-        $note=json_encode(array('authorid'=>(is_object($user)?$user->id:0), 'ip'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR'])));
+        $note = json_encode(array('authorid'=>(is_object($user) ? $user->id : 0), 'ip'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])));
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
-        $sql.= " (".$this->db->encrypt($this->const_name, 1);
-        $sql.= ", ".$this->db->encrypt('1', 1);
-        $sql.= ", 0, ".$entity;
-        $sql.= ", '".$this->db->escape($note)."')";
+        $sql .= " (".$this->db->encrypt($this->const_name, 1);
+        $sql .= ", ".$this->db->encrypt('1', 1);
+        $sql .= ", 0, ".$entity;
+        $sql .= ", '".$this->db->escape($note)."')";
 
         dol_syslog(get_class($this)."::_active insert activation constant", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) { $err++;
+        $resql = $this->db->query($sql);
+        if (!$resql) { $err++;
         }
 
         return $err;
@@ -1019,11 +1019,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         $err = 0;
 
         // Common module
-        $entity = ((! empty($this->always_enabled) || ! empty($this->core_enabled)) ? 0 : $conf->entity);
+        $entity = ((!empty($this->always_enabled) || !empty($this->core_enabled)) ? 0 : $conf->entity);
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql.= " AND entity IN (0, ".$entity.")";
+        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+        $sql .= " AND entity IN (0, ".$entity.")";
 
         dol_syslog(get_class($this)."::_unactive", LOG_DEBUG);
         $this->db->query($sql);
@@ -1047,37 +1047,37 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $error=0;
-        $dirfound=0;
+        $error = 0;
+        $dirfound = 0;
 
         if (empty($reldir)) {
             return 1;
         }
 
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
         $ok = 1;
-        foreach($conf->file->dol_document_root as $dirroot)
+        foreach ($conf->file->dol_document_root as $dirroot)
         {
             if ($ok) {
                 $dir = $dirroot.$reldir;
                 $ok = 0;
 
-                $handle=@opendir($dir);         // Dir may not exists
+                $handle = @opendir($dir); // Dir may not exists
                 if (is_resource($handle)) {
                     $dirfound++;
 
                     // Run llx_mytable.sql files, then llx_mytable_*.sql
                     $files = array();
-                    while (($file = readdir($handle))!==false)
+                    while (($file = readdir($handle)) !== false)
                     {
                         $files[] = $file;
                     }
                     sort($files);
                     foreach ($files as $file)
                     {
-                        if (preg_match('/\.sql$/i', $file) && ! preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
-                            $result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?1:0, '', 1);
+                        if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
+                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
                             if ($result <= 0) { $error++;
                             }
                         }
@@ -1087,7 +1087,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
                     // Run llx_mytable.key.sql files (Must be done after llx_mytable.sql) then then llx_mytable_*.key.sql
                     $files = array();
-                    while (($file = readdir($handle))!==false)
+                    while (($file = readdir($handle)) !== false)
                     {
                         $files[] = $file;
                     }
@@ -1095,7 +1095,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     foreach ($files as $file)
                     {
                         if (preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
-                            $result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?1:0, '', 1);
+                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
                             if ($result <= 0) { $error++;
                             }
                         }
@@ -1105,15 +1105,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
                     // Run data_xxx.sql files (Must be done after llx_mytable.key.sql)
                     $files = array();
-                    while (($file = readdir($handle))!==false)
+                    while (($file = readdir($handle)) !== false)
                     {
                                $files[] = $file;
                     }
                     sort($files);
                     foreach ($files as $file)
                     {
-                        if (preg_match('/\.sql$/i', $file) && ! preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'data') {
-                            $result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?1:0, '', 1);
+                        if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'data') {
+                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
                             if ($result <= 0) { $error++;
                             }
                         }
@@ -1123,15 +1123,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
                     // Run update_xxx.sql files
                     $files = array();
-                    while (($file = readdir($handle))!==false)
+                    while (($file = readdir($handle)) !== false)
                     {
                                $files[] = $file;
                     }
                     sort($files);
                     foreach ($files as $file)
                     {
-                        if (preg_match('/\.sql$/i', $file) && ! preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 6) == 'update') {
-                            $result=run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG)?1:0, '', 1);
+                        if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 6) == 'update') {
+                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
                             if ($result <= 0) { $error++;
                             }
                         }
@@ -1146,7 +1146,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             }
         }
 
-        if (! $dirfound) {
+        if (!$dirfound) {
             dol_syslog("A module ask to load sql files into ".$reldir." but this directory was not found.", LOG_WARNING);
         }
         return $ok;
@@ -1164,11 +1164,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     public function insert_boxes($option = '')
     {
         // phpcs:enable
-        include_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         if (is_array($this->boxes)) {
             dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
@@ -1177,65 +1177,65 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
             foreach ($this->boxes as $key => $value)
             {
-                $file  = isset($this->boxes[$key]['file'])?$this->boxes[$key]['file']:'';
-                $note  = isset($this->boxes[$key]['note'])?$this->boxes[$key]['note']:'';
-                $enabledbydefaulton = isset($this->boxes[$key]['enabledbydefaulton'])?$this->boxes[$key]['enabledbydefaulton']:'Home';
+                $file  = isset($this->boxes[$key]['file']) ? $this->boxes[$key]['file'] : '';
+                $note  = isset($this->boxes[$key]['note']) ? $this->boxes[$key]['note'] : '';
+                $enabledbydefaulton = isset($this->boxes[$key]['enabledbydefaulton']) ? $this->boxes[$key]['enabledbydefaulton'] : 'Home';
 
-                if (empty($file)) { $file  = isset($this->boxes[$key][1])?$this->boxes[$key][1]:'';    // For backward compatibility
+                if (empty($file)) { $file  = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
                 }
-                if (empty($note)) { $note  = isset($this->boxes[$key][2])?$this->boxes[$key][2]:'';    // For backward compatibility
+                if (empty($note)) { $note  = isset($this->boxes[$key][2]) ? $this->boxes[$key][2] : ''; // For backward compatibility
                 }
 
                 // Search if boxes def already present
                 $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."boxes_def";
-                $sql.= " WHERE file = '".$this->db->escape($file)."'";
-                $sql.= " AND entity = ".$conf->entity;
-                if ($note) { $sql.=" AND note ='".$this->db->escape($note)."'";
+                $sql .= " WHERE file = '".$this->db->escape($file)."'";
+                $sql .= " AND entity = ".$conf->entity;
+                if ($note) { $sql .= " AND note ='".$this->db->escape($note)."'";
                 }
 
-                $result=$this->db->query($sql);
+                $result = $this->db->query($sql);
                 if ($result) {
                     $obj = $this->db->fetch_object($result);
                     if ($obj->nb == 0) {
                         $this->db->begin();
 
-                        if (! $err) {
+                        if (!$err) {
                             $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, entity, note)";
-                            $sql.= " VALUES ('".$this->db->escape($file)."', ";
-                            $sql.= $conf->entity.", ";
-                            $sql.= $note?"'".$this->db->escape($note)."'":"null";
-                            $sql.= ")";
+                            $sql .= " VALUES ('".$this->db->escape($file)."', ";
+                            $sql .= $conf->entity.", ";
+                            $sql .= $note ? "'".$this->db->escape($note)."'" : "null";
+                            $sql .= ")";
 
                             dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
-                            $resql=$this->db->query($sql);
-                            if (! $resql) { $err++;
+                            $resql = $this->db->query($sql);
+                            if (!$resql) { $err++;
                             }
                         }
-                        if (! $err && ! preg_match('/newboxdefonly/', $option)) {
-                            $lastid=$this->db->last_insert_id(MAIN_DB_PREFIX."boxes_def", "rowid");
+                        if (!$err && !preg_match('/newboxdefonly/', $option)) {
+                            $lastid = $this->db->last_insert_id(MAIN_DB_PREFIX."boxes_def", "rowid");
 
                             foreach ($pos_name as $key2 => $val2)
                             {
                                     //print 'key2='.$key2.'-val2='.$val2."<br>\n";
-                                if ($enabledbydefaulton && $val2 != $enabledbydefaulton) { continue;        // Not enabled by default onto this page.
+                                if ($enabledbydefaulton && $val2 != $enabledbydefaulton) { continue; // Not enabled by default onto this page.
                                 }
 
                                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";
-                                $sql.= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";
+                                $sql .= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";
 
                                 dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);
-                                $resql=$this->db->query($sql);
-                                if (! $resql) { $err++;
+                                $resql = $this->db->query($sql);
+                                if (!$resql) { $err++;
                                 }
                             }
                         }
 
-                        if (! $err) {
+                        if (!$err) {
                             $this->db->commit();
                         }
                         else
                         {
-                                  $this->error=$this->db->lasterror();
+                                  $this->error = $this->db->lasterror();
                                   $this->db->rollback();
                         }
                     }
@@ -1243,7 +1243,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 }
                 else
                 {
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     $err++;
                 }
             }
@@ -1264,26 +1264,26 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         if (is_array($this->boxes)) {
             foreach ($this->boxes as $key => $value)
             {
                 //$titre = $this->boxes[$key][0];
-                $file  = $this->boxes[$key]['file'];
+                $file = $this->boxes[$key]['file'];
                 //$note  = $this->boxes[$key][2];
 
                 // TODO If the box is also included by another module and the other module is still on, we should not remove it.
                 // For the moment, we manage this with hard coded exception
                 //print "Remove box ".$file.'<br>';
                 if ($file == 'box_graph_product_distribution.php') {
-                    if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) {
+                    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
                         dol_syslog("We discard disabling of module ".$file." because another module still active require it.");
                         continue;
                     }
                 }
 
-                if (empty($file)) { $file  = isset($this->boxes[$key][1])?$this->boxes[$key][1]:'';    // For backward compatibility
+                if (empty($file)) { $file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
                 }
 
                 if ($this->db->type == 'sqlite3') {
@@ -1297,27 +1297,27 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     $sql .= "AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
                 } else {
                     $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-                    $sql.= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
-                    $sql.= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
-                    $sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";
-                    $sql.= " AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
+                    $sql .= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
+                    $sql .= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
+                    $sql .= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";
+                    $sql .= " AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
                 }
 
                 dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
-                $resql=$this->db->query($sql);
-                if (! $resql) {
-                    $this->error=$this->db->lasterror();
+                $resql = $this->db->query($sql);
+                if (!$resql) {
+                    $this->error = $this->db->lasterror();
                     $err++;
                 }
 
                 $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
-                $sql.= " WHERE file = '".$this->db->escape($file)."'";
-                $sql.= " AND entity = ".$conf->entity;
+                $sql .= " WHERE file = '".$this->db->escape($file)."'";
+                $sql .= " AND entity = ".$conf->entity;
 
                 dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
-                $resql=$this->db->query($sql);
-                if (! $resql) {
-                    $this->error=$this->db->lasterror();
+                $resql = $this->db->query($sql);
+                if (!$resql) {
+                    $this->error = $this->db->lasterror();
                     $err++;
                 }
             }
@@ -1335,102 +1335,102 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     public function insert_cronjobs()
     {
         // phpcs:enable
-        include_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         if (is_array($this->cronjobs)) {
             dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
 
             foreach ($this->cronjobs as $key => $value)
             {
-                $entity  = isset($this->cronjobs[$key]['entity'])?$this->cronjobs[$key]['entity']:$conf->entity;
-                $label  = isset($this->cronjobs[$key]['label'])?$this->cronjobs[$key]['label']:'';
-                $jobtype  = isset($this->cronjobs[$key]['jobtype'])?$this->cronjobs[$key]['jobtype']:'';
-                $class  = isset($this->cronjobs[$key]['class'])?$this->cronjobs[$key]['class']:'';
-                $objectname  = isset($this->cronjobs[$key]['objectname'])?$this->cronjobs[$key]['objectname']:'';
-                $method = isset($this->cronjobs[$key]['method'])?$this->cronjobs[$key]['method']:'';
-                $command  = isset($this->cronjobs[$key]['command'])?$this->cronjobs[$key]['command']:'';
-                $parameters  = isset($this->cronjobs[$key]['parameters'])?$this->cronjobs[$key]['parameters']:'';
-                $comment = isset($this->cronjobs[$key]['comment'])?$this->cronjobs[$key]['comment']:'';
-                $frequency = isset($this->cronjobs[$key]['frequency'])?$this->cronjobs[$key]['frequency']:'';
-                $unitfrequency = isset($this->cronjobs[$key]['unitfrequency'])?$this->cronjobs[$key]['unitfrequency']:'';
-                $priority = isset($this->cronjobs[$key]['priority'])?$this->cronjobs[$key]['priority']:'';
-                $datestart = isset($this->cronjobs[$key]['datestart'])?$this->cronjobs[$key]['datestart']:'';
-                $dateend = isset($this->cronjobs[$key]['dateend'])?$this->cronjobs[$key]['dateend']:'';
-                $status = isset($this->cronjobs[$key]['status'])?$this->cronjobs[$key]['status']:'';
-                $test = isset($this->cronjobs[$key]['test'])?$this->cronjobs[$key]['test']:'';                    // Line must be enabled or not (so visible or not)
+                $entity = isset($this->cronjobs[$key]['entity']) ? $this->cronjobs[$key]['entity'] : $conf->entity;
+                $label  = isset($this->cronjobs[$key]['label']) ? $this->cronjobs[$key]['label'] : '';
+                $jobtype = isset($this->cronjobs[$key]['jobtype']) ? $this->cronjobs[$key]['jobtype'] : '';
+                $class  = isset($this->cronjobs[$key]['class']) ? $this->cronjobs[$key]['class'] : '';
+                $objectname  = isset($this->cronjobs[$key]['objectname']) ? $this->cronjobs[$key]['objectname'] : '';
+                $method = isset($this->cronjobs[$key]['method']) ? $this->cronjobs[$key]['method'] : '';
+                $command = isset($this->cronjobs[$key]['command']) ? $this->cronjobs[$key]['command'] : '';
+                $parameters  = isset($this->cronjobs[$key]['parameters']) ? $this->cronjobs[$key]['parameters'] : '';
+                $comment = isset($this->cronjobs[$key]['comment']) ? $this->cronjobs[$key]['comment'] : '';
+                $frequency = isset($this->cronjobs[$key]['frequency']) ? $this->cronjobs[$key]['frequency'] : '';
+                $unitfrequency = isset($this->cronjobs[$key]['unitfrequency']) ? $this->cronjobs[$key]['unitfrequency'] : '';
+                $priority = isset($this->cronjobs[$key]['priority']) ? $this->cronjobs[$key]['priority'] : '';
+                $datestart = isset($this->cronjobs[$key]['datestart']) ? $this->cronjobs[$key]['datestart'] : '';
+                $dateend = isset($this->cronjobs[$key]['dateend']) ? $this->cronjobs[$key]['dateend'] : '';
+                $status = isset($this->cronjobs[$key]['status']) ? $this->cronjobs[$key]['status'] : '';
+                $test = isset($this->cronjobs[$key]['test']) ? $this->cronjobs[$key]['test'] : ''; // Line must be enabled or not (so visible or not)
 
                 // Search if cron entry already present
                 $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
-                $sql.= " WHERE module_name = '".$this->db->escape(empty($this->rights_class)?strtolower($this->name):$this->rights_class)."'";
+                $sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
                 if ($class) {
-                    $sql.= " AND classesname = '".$this->db->escape($class)."'";
+                    $sql .= " AND classesname = '".$this->db->escape($class)."'";
                 }
                 if ($objectname) {
-                    $sql.= " AND objectname = '".$this->db->escape($objectname)."'";
+                    $sql .= " AND objectname = '".$this->db->escape($objectname)."'";
                 }
                 if ($method) {
-                    $sql.= " AND methodename = '".$this->db->escape($method)."'";
+                    $sql .= " AND methodename = '".$this->db->escape($method)."'";
                 }
                 if ($command) {
-                    $sql.= " AND command = '".$this->db->escape($command)."'";
+                    $sql .= " AND command = '".$this->db->escape($command)."'";
                 }
-                $sql.= " AND entity = ".$entity;    // Must be exact entity
+                $sql .= " AND entity = ".$entity; // Must be exact entity
 
-                $now=dol_now();
+                $now = dol_now();
 
-                $result=$this->db->query($sql);
+                $result = $this->db->query($sql);
                 if ($result) {
                     $obj = $this->db->fetch_object($result);
                     if ($obj->nb == 0) {
                         $this->db->begin();
 
-                        if (! $err) {
+                        if (!$err) {
                             $sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob (module_name, datec, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,";
-                            if (is_int($frequency)) { $sql.= ' frequency,'; }
-                            if (is_int($unitfrequency)) { $sql.= ' unitfrequency,'; }
-                            if (is_int($priority)) { $sql.= ' priority,'; }
-                            if (is_int($status)) { $sql.= ' status,'; }
-                            $sql.= " entity, test)";
-                            $sql.= " VALUES (";
-                            $sql.= "'".$this->db->escape(empty($this->rights_class)?strtolower($this->name):$this->rights_class)."', ";
-                            $sql.= "'".$this->db->idate($now)."', ";
-                            $sql.= ($datestart ? "'".$this->db->idate($datestart)."'" : "'".$this->db->idate($now)."'").", ";
-                            $sql.= ($dateend   ? "'".$this->db->idate($dateend)."'"   : "NULL").", ";
-                            $sql.= "'".$this->db->escape($label)."', ";
-                            $sql.= "'".$this->db->escape($jobtype)."', ";
-                            $sql.= ($class?"'".$this->db->escape($class)."'":"null").",";
-                            $sql.= ($objectname?"'".$this->db->escape($objectname)."'":"null").",";
-                            $sql.= ($method?"'".$this->db->escape($method)."'":"null").",";
-                            $sql.= ($command?"'".$this->db->escape($command)."'":"null").",";
-                            $sql.= ($parameters?"'".$this->db->escape($parameters)."'":"null").",";
-                            $sql.= ($comment?"'".$this->db->escape($comment)."'":"null").",";
-                            if(is_int($frequency)) { $sql.= "'".$this->db->escape($frequency)."', ";
+                            if (is_int($frequency)) { $sql .= ' frequency,'; }
+                            if (is_int($unitfrequency)) { $sql .= ' unitfrequency,'; }
+                            if (is_int($priority)) { $sql .= ' priority,'; }
+                            if (is_int($status)) { $sql .= ' status,'; }
+                            $sql .= " entity, test)";
+                            $sql .= " VALUES (";
+                            $sql .= "'".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."', ";
+                            $sql .= "'".$this->db->idate($now)."', ";
+                            $sql .= ($datestart ? "'".$this->db->idate($datestart)."'" : "'".$this->db->idate($now)."'").", ";
+                            $sql .= ($dateend ? "'".$this->db->idate($dateend)."'" : "NULL").", ";
+                            $sql .= "'".$this->db->escape($label)."', ";
+                            $sql .= "'".$this->db->escape($jobtype)."', ";
+                            $sql .= ($class ? "'".$this->db->escape($class)."'" : "null").",";
+                            $sql .= ($objectname ? "'".$this->db->escape($objectname)."'" : "null").",";
+                            $sql .= ($method ? "'".$this->db->escape($method)."'" : "null").",";
+                            $sql .= ($command ? "'".$this->db->escape($command)."'" : "null").",";
+                            $sql .= ($parameters ? "'".$this->db->escape($parameters)."'" : "null").",";
+                            $sql .= ($comment ? "'".$this->db->escape($comment)."'" : "null").",";
+                            if (is_int($frequency)) { $sql .= "'".$this->db->escape($frequency)."', ";
                             }
-                            if(is_int($unitfrequency)) { $sql.= "'".$this->db->escape($unitfrequency)."', ";
+                            if (is_int($unitfrequency)) { $sql .= "'".$this->db->escape($unitfrequency)."', ";
                             }
-                            if(is_int($priority)) {$sql.= "'".$this->db->escape($priority)."', ";
+                            if (is_int($priority)) {$sql .= "'".$this->db->escape($priority)."', ";
                             }
-                            if(is_int($status)) { $sql.= "'".$this->db->escape($status)."', ";
+                            if (is_int($status)) { $sql .= "'".$this->db->escape($status)."', ";
                             }
-                            $sql.= $entity.",";
-                            $sql.= "'".$this->db->escape($test)."'";
-                            $sql.= ")";
+                            $sql .= $entity.",";
+                            $sql .= "'".$this->db->escape($test)."'";
+                            $sql .= ")";
 
-                            $resql=$this->db->query($sql);
-                            if (! $resql) { $err++;
+                            $resql = $this->db->query($sql);
+                            if (!$resql) { $err++;
                             }
                         }
 
-                        if (! $err) {
+                        if (!$err) {
                             $this->db->commit();
                         }
                         else
                         {
-                            $this->error=$this->db->lasterror();
+                            $this->error = $this->db->lasterror();
                             $this->db->rollback();
                         }
                     }
@@ -1438,7 +1438,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 }
                 else
                 {
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     $err++;
                 }
             }
@@ -1459,19 +1459,19 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         if (is_array($this->cronjobs)) {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
-            $sql.= " WHERE module_name = '".$this->db->escape(empty($this->rights_class)?strtolower($this->name):$this->rights_class)."'";
-            $sql.= " AND entity = ".$conf->entity;
-            $sql.= " AND test = '1'";        // We delete on lines that are not set with a complete test that is '$conf->module->enabled' so when module is disabled, the cron is also removed.
+            $sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
+            $sql .= " AND entity = ".$conf->entity;
+            $sql .= " AND test = '1'"; // We delete on lines that are not set with a complete test that is '$conf->module->enabled' so when module is disabled, the cron is also removed.
               // For crons declared with a '$conf->module->enabled', there is no need to delete the line, so we don't loose setup if we reenable module.
 
             dol_syslog(get_class($this)."::delete_cronjobs", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (! $resql) {
-                $this->error=$this->db->lasterror();
+            $resql = $this->db->query($sql);
+            if (!$resql) {
+                $this->error = $this->db->lasterror();
                 $err++;
             }
         }
@@ -1490,15 +1490,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." like '".$this->db->escape($this->const_name)."_TABS_%'";
-        $sql.= " AND entity = ".$conf->entity;
+        $sql .= " WHERE ".$this->db->decrypt('name')." like '".$this->db->escape($this->const_name)."_TABS_%'";
+        $sql .= " AND entity = ".$conf->entity;
 
         dol_syslog(get_class($this)."::delete_tabs", LOG_DEBUG);
-        if (! $this->db->query($sql)) {
-            $this->error=$this->db->lasterror();
+        if (!$this->db->query($sql)) {
+            $this->error = $this->db->lasterror();
             $err++;
         }
 
@@ -1516,18 +1516,18 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
-        if (! empty($this->tabs)) {
+        if (!empty($this->tabs)) {
             dol_syslog(get_class($this)."::insert_tabs", LOG_DEBUG);
 
-            $i=0;
+            $i = 0;
             foreach ($this->tabs as $key => $value)
             {
-                if (is_array($value) && count($value) == 0) { continue;    // Discard empty arrays
+                if (is_array($value) && count($value) == 0) { continue; // Discard empty arrays
                 }
 
-                $entity=$conf->entity;
+                $entity = $conf->entity;
                 $newvalue = $value;
 
                 if (is_array($value)) {
@@ -1538,24 +1538,24 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
                 if ($newvalue) {
                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";
-                    $sql.= "name";
-                    $sql.= ", type";
-                    $sql.= ", value";
-                    $sql.= ", note";
-                    $sql.= ", visible";
-                    $sql.= ", entity";
-                    $sql.= ")";
-                    $sql.= " VALUES (";
-                    $sql.= $this->db->encrypt($this->const_name."_TABS_".$i, 1);
-                    $sql.= ", 'chaine'";
-                    $sql.= ", ".$this->db->encrypt($newvalue, 1);
-                    $sql.= ", null";
-                    $sql.= ", '0'";
-                    $sql.= ", ".$entity;
-                    $sql.= ")";
+                    $sql .= "name";
+                    $sql .= ", type";
+                    $sql .= ", value";
+                    $sql .= ", note";
+                    $sql .= ", visible";
+                    $sql .= ", entity";
+                    $sql .= ")";
+                    $sql .= " VALUES (";
+                    $sql .= $this->db->encrypt($this->const_name."_TABS_".$i, 1);
+                    $sql .= ", 'chaine'";
+                    $sql .= ", ".$this->db->encrypt($newvalue, 1);
+                    $sql .= ", null";
+                    $sql .= ", '0'";
+                    $sql .= ", ".$entity;
+                    $sql .= ")";
 
                     $resql = $this->db->query($sql);
-                    if (! $resql) {
+                    if (!$resql) {
                          dol_syslog($this->db->lasterror(), LOG_ERR);
                         if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                             $this->error = $this->db->lasterror();
@@ -1582,7 +1582,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         if (empty($this->const)) { return 0;
         }
@@ -1594,38 +1594,38 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             $name      = $this->const[$key][0];
             $type      = $this->const[$key][1];
             $val       = $this->const[$key][2];
-            $note      = isset($this->const[$key][3])?$this->const[$key][3]:'';
-            $visible   = isset($this->const[$key][4])?$this->const[$key][4]:0;
-            $entity    = (! empty($this->const[$key][5]) && $this->const[$key][5]!='current')?0:$conf->entity;
+            $note      = isset($this->const[$key][3]) ? $this->const[$key][3] : '';
+            $visible   = isset($this->const[$key][4]) ? $this->const[$key][4] : 0;
+            $entity    = (!empty($this->const[$key][5]) && $this->const[$key][5] != 'current') ? 0 : $conf->entity;
 
             // Clean
-            if (empty($visible)) { $visible='0';
+            if (empty($visible)) { $visible = '0';
             }
-            if (empty($val) && $val != '0') { $val='';
+            if (empty($val) && $val != '0') { $val = '';
             }
 
             $sql = "SELECT count(*)";
-            $sql.= " FROM ".MAIN_DB_PREFIX."const";
-            $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
-            $sql.= " AND entity = ".$entity;
+            $sql .= " FROM ".MAIN_DB_PREFIX."const";
+            $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
+            $sql .= " AND entity = ".$entity;
 
-            $result=$this->db->query($sql);
+            $result = $this->db->query($sql);
             if ($result) {
                 $row = $this->db->fetch_row($result);
 
                 if ($row[0] == 0)   // If not found
                 {
                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
-                    $sql.= " VALUES (";
-                    $sql.= $this->db->encrypt($name, 1);
-                    $sql.= ",'".$type."'";
-                    $sql.= ",".(($val != '')?$this->db->encrypt($val, 1):"''");
-                    $sql.= ",".($note?"'".$this->db->escape($note)."'":"null");
-                    $sql.= ",'".$visible."'";
-                    $sql.= ",".$entity;
-                    $sql.= ")";
+                    $sql .= " VALUES (";
+                    $sql .= $this->db->encrypt($name, 1);
+                    $sql .= ",'".$type."'";
+                    $sql .= ",".(($val != '') ? $this->db->encrypt($val, 1) : "''");
+                    $sql .= ",".($note ? "'".$this->db->escape($note)."'" : "null");
+                    $sql .= ",'".$visible."'";
+                    $sql .= ",".$entity;
+                    $sql .= ")";
 
-                    if (! $this->db->query($sql) ) {
+                    if (!$this->db->query($sql)) {
                         $err++;
                     }
                 }
@@ -1654,23 +1654,23 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         if (empty($this->const)) { return 0;
         }
 
         foreach ($this->const as $key => $value)
         {
-            $name      = $this->const[$key][0];
-            $deleteonunactive = (! empty($this->const[$key][6]))?1:0;
+            $name = $this->const[$key][0];
+            $deleteonunactive = (!empty($this->const[$key][6])) ? 1 : 0;
 
             if ($deleteonunactive) {
                 $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-                $sql.= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
-                $sql.= " AND entity in (0, ".$conf->entity.")";
+                $sql .= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
+                $sql .= " AND entity in (0, ".$conf->entity.")";
                 dol_syslog(get_class($this)."::delete_const", LOG_DEBUG);
-                if (! $this->db->query($sql)) {
-                    $this->error=$this->db->lasterror();
+                if (!$this->db->query($sql)) {
+                    $this->error = $this->db->lasterror();
                     $err++;
                 }
             }
@@ -1691,59 +1691,59 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     public function insert_permissions($reinitadminperms = 0, $force_entity = null, $notrigger = 0)
     {
         // phpcs:enable
-        global $conf,$user;
+        global $conf, $user;
 
-        $err=0;
-        $entity=(! empty($force_entity) ? $force_entity : $conf->entity);
+        $err = 0;
+        $entity = (!empty($force_entity) ? $force_entity : $conf->entity);
 
         dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
 
         // Test if module is activated
         $sql_del = "SELECT ".$this->db->decrypt('value')." as value";
-        $sql_del.= " FROM ".MAIN_DB_PREFIX."const";
-        $sql_del.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql_del.= " AND entity IN (0,".$entity.")";
+        $sql_del .= " FROM ".MAIN_DB_PREFIX."const";
+        $sql_del .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+        $sql_del .= " AND entity IN (0,".$entity.")";
 
-        $resql=$this->db->query($sql_del);
+        $resql = $this->db->query($sql_del);
 
         if ($resql) {
-            $obj=$this->db->fetch_object($resql);
-            if ($obj !== null && ! empty($obj->value) && ! empty($this->rights)) {
+            $obj = $this->db->fetch_object($resql);
+            if ($obj !== null && !empty($obj->value) && !empty($this->rights)) {
                 // If the module is active
                 foreach ($this->rights as $key => $value)
                 {
                     $r_id       = $this->rights[$key][0];
                     $r_desc     = $this->rights[$key][1];
-                    $r_type     = isset($this->rights[$key][2])?$this->rights[$key][2]:'';
+                    $r_type     = isset($this->rights[$key][2]) ? $this->rights[$key][2] : '';
                     $r_def      = $this->rights[$key][3];
                     $r_perms    = $this->rights[$key][4];
-                    $r_subperms = isset($this->rights[$key][5])?$this->rights[$key][5]:'';
-                    $r_modul = empty($this->rights_class)?strtolower($this->name):$this->rights_class;
+                    $r_subperms = isset($this->rights[$key][5]) ? $this->rights[$key][5] : '';
+                    $r_modul = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
 
-                    if (empty($r_type)) { $r_type='w'; }
-                    if (empty($r_def)) { $r_def=0; }
+                    if (empty($r_type)) { $r_type = 'w'; }
+                    if (empty($r_def)) { $r_def = 0; }
 
                     // Search if perm already present
                     $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
-                    $sql.= " WHERE id = ".$r_id." AND entity = ".$entity;
+                    $sql .= " WHERE id = ".$r_id." AND entity = ".$entity;
 
-                    $resqlselect=$this->db->query($sql);
+                    $resqlselect = $this->db->query($sql);
                     if ($resqlselect) {
                         $objcount = $this->db->fetch_object($resqlselect);
                         if ($objcount && $objcount->nb == 0) {
-                            if (dol_strlen($r_perms) ) {
-                                if (dol_strlen($r_subperms) ) {
+                            if (dol_strlen($r_perms)) {
+                                if (dol_strlen($r_subperms)) {
                                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
-                                    $sql.= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
-                                    $sql.= " VALUES ";
-                                    $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
+                                    $sql .= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
+                                    $sql .= " VALUES ";
+                                    $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
                                 }
                                 else
                                    {
                                     $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
-                                    $sql.= " (id, entity, libelle, module, type, bydefault, perms)";
-                                    $sql.= " VALUES ";
-                                    $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
+                                    $sql .= " (id, entity, libelle, module, type, bydefault, perms)";
+                                    $sql .= " VALUES ";
+                                    $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
                                 }
                             }
                             else
@@ -1754,11 +1754,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                                  $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
                             }
 
-                            $resqlinsert=$this->db->query($sql, 1);
+                            $resqlinsert = $this->db->query($sql, 1);
 
-                            if (! $resqlinsert) {
+                            if (!$resqlinsert) {
                                 if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS") {
-                                    $this->error=$this->db->lasterror();
+                                    $this->error = $this->db->lasterror();
                                     $err++;
                                     break;
                                 }
@@ -1774,21 +1774,21 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
                     // If we want to init permissions on admin users
                     if ($reinitadminperms) {
-                        if (! class_exists('User')) {
-                            include_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
+                        if (!class_exists('User')) {
+                            include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
                         }
-                        $sql="SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1";
+                        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1";
                         dol_syslog(get_class($this)."::insert_permissions Search all admin users", LOG_DEBUG);
-                        $resqlseladmin=$this->db->query($sql, 1);
+                        $resqlseladmin = $this->db->query($sql, 1);
                         if ($resqlseladmin) {
-                            $num=$this->db->num_rows($resqlseladmin);
-                            $i=0;
+                            $num = $this->db->num_rows($resqlseladmin);
+                            $i = 0;
                             while ($i < $num)
                             {
-                                  $obj2=$this->db->fetch_object($resqlseladmin);
+                                  $obj2 = $this->db->fetch_object($resqlseladmin);
                                   dol_syslog(get_class($this)."::insert_permissions Add permission to user id=".$obj2->rowid);
 
-                                  $tmpuser=new User($this->db);
+                                  $tmpuser = new User($this->db);
                                   $result = $tmpuser->fetch($obj2->rowid);
                                 if ($result > 0) {
                                     $tmpuser->addrights($r_id, '', '', 0, 1);
@@ -1807,7 +1807,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                     }
                 }
 
-                if ($reinitadminperms && ! empty($user->admin))  // Reload permission for current user if defined
+                if ($reinitadminperms && !empty($user->admin))  // Reload permission for current user if defined
                 {
                     // We reload permissions
                     $user->clearrights();
@@ -1818,7 +1818,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $err++;
         }
 
@@ -1837,14 +1837,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def";
-        $sql.= " WHERE module = '".$this->db->escape(empty($this->rights_class)?strtolower($this->name):$this->rights_class)."'";
-        $sql.= " AND entity = ".$conf->entity;
+        $sql .= " WHERE module = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
+        $sql .= " AND entity = ".$conf->entity;
         dol_syslog(get_class($this)."::delete_permissions", LOG_DEBUG);
-        if (! $this->db->query($sql)) {
-            $this->error=$this->db->lasterror();
+        if (!$this->db->query($sql)) {
+            $this->error = $this->db->lasterror();
             $err++;
         }
 
@@ -1863,80 +1863,80 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $user;
 
-        if (! is_array($this->menu) || empty($this->menu)) { return 0;
+        if (!is_array($this->menu) || empty($this->menu)) { return 0;
         }
 
-        include_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
 
         dol_syslog(get_class($this)."::insert_menus", LOG_DEBUG);
 
-        $err=0;
+        $err = 0;
 
         $this->db->begin();
 
         foreach ($this->menu as $key => $value)
         {
             $menu = new Menubase($this->db);
-            $menu->menu_handler='all';
+            $menu->menu_handler = 'all';
 
             //$menu->module=strtolower($this->name);    TODO When right_class will be same than module name
-            $menu->module=empty($this->rights_class)?strtolower($this->name):$this->rights_class;
+            $menu->module = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
 
-            if (! $this->menu[$key]['fk_menu']) {
-                $menu->fk_menu=0;
+            if (!$this->menu[$key]['fk_menu']) {
+                $menu->fk_menu = 0;
             }
             else
             {
-                $foundparent=0;
-                $fk_parent=$this->menu[$key]['fk_menu'];
+                $foundparent = 0;
+                $fk_parent = $this->menu[$key]['fk_menu'];
                 if (preg_match('/^r=/', $fk_parent))    // old deprecated method
                 {
-                    $fk_parent=str_replace('r=', '', $fk_parent);
+                    $fk_parent = str_replace('r=', '', $fk_parent);
                     if (isset($this->menu[$fk_parent]['rowid'])) {
-                        $menu->fk_menu=$this->menu[$fk_parent]['rowid'];
-                        $foundparent=1;
+                        $menu->fk_menu = $this->menu[$fk_parent]['rowid'];
+                        $foundparent = 1;
                     }
                 }
                 elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+),fk_leftmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
-                    $menu->fk_menu=-1;
-                    $menu->fk_mainmenu=$reg[1];
-                    $menu->fk_leftmenu=$reg[2];
-                    $foundparent=1;
+                    $menu->fk_menu = -1;
+                    $menu->fk_mainmenu = $reg[1];
+                    $menu->fk_leftmenu = $reg[2];
+                    $foundparent = 1;
                 }
                 elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
-                    $menu->fk_menu=-1;
-                    $menu->fk_mainmenu=$reg[1];
-                    $menu->fk_leftmenu='';
-                    $foundparent=1;
+                    $menu->fk_menu = -1;
+                    $menu->fk_mainmenu = $reg[1];
+                    $menu->fk_leftmenu = '';
+                    $foundparent = 1;
                 }
-                if (! $foundparent) {
-                    $this->error="ErrorBadDefinitionOfMenuArrayInModuleDescriptor";
+                if (!$foundparent) {
+                    $this->error = "ErrorBadDefinitionOfMenuArrayInModuleDescriptor";
                     dol_syslog(get_class($this)."::insert_menus ".$this->error." ".$this->menu[$key]['fk_menu'], LOG_ERR);
                     $err++;
                 }
             }
-            $menu->type=$this->menu[$key]['type'];
-            $menu->mainmenu=isset($this->menu[$key]['mainmenu'])?$this->menu[$key]['mainmenu']:(isset($menu->fk_mainmenu)?$menu->fk_mainmenu:'');
-            $menu->leftmenu=isset($this->menu[$key]['leftmenu'])?$this->menu[$key]['leftmenu']:'';
-            $menu->titre=$this->menu[$key]['titre'];	// deprecated
-            $menu->title=$this->menu[$key]['titre'];
-            $menu->url=$this->menu[$key]['url'];
-            $menu->langs=$this->menu[$key]['langs'];
-            $menu->position=$this->menu[$key]['position'];
-            $menu->perms=$this->menu[$key]['perms'];
-            $menu->target=isset($this->menu[$key]['target'])?$this->menu[$key]['target']:'';
-            $menu->user=$this->menu[$key]['user'];
-            $menu->enabled=isset($this->menu[$key]['enabled'])?$this->menu[$key]['enabled']:0;
-            $menu->position=$this->menu[$key]['position'];
+            $menu->type = $this->menu[$key]['type'];
+            $menu->mainmenu = isset($this->menu[$key]['mainmenu']) ? $this->menu[$key]['mainmenu'] : (isset($menu->fk_mainmenu) ? $menu->fk_mainmenu : '');
+            $menu->leftmenu = isset($this->menu[$key]['leftmenu']) ? $this->menu[$key]['leftmenu'] : '';
+            $menu->titre = $this->menu[$key]['titre']; // deprecated
+            $menu->title = $this->menu[$key]['titre'];
+            $menu->url = $this->menu[$key]['url'];
+            $menu->langs = $this->menu[$key]['langs'];
+            $menu->position = $this->menu[$key]['position'];
+            $menu->perms = $this->menu[$key]['perms'];
+            $menu->target = isset($this->menu[$key]['target']) ? $this->menu[$key]['target'] : '';
+            $menu->user = $this->menu[$key]['user'];
+            $menu->enabled = isset($this->menu[$key]['enabled']) ? $this->menu[$key]['enabled'] : 0;
+            $menu->position = $this->menu[$key]['position'];
 
-            if (! $err) {
-                $result=$menu->create($user);    // Save menu entry into table llx_menu
+            if (!$err) {
+                $result = $menu->create($user); // Save menu entry into table llx_menu
                 if ($result > 0) {
-                    $this->menu[$key]['rowid']=$result;
+                    $this->menu[$key]['rowid'] = $result;
                 }
                 else
                 {
-                    $this->error=$menu->error;
+                    $this->error = $menu->error;
                     dol_syslog(get_class($this).'::insert_menus result='.$result." ".$this->error, LOG_ERR);
                     $err++;
                     break;
@@ -1944,7 +1944,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
             }
         }
 
-        if (! $err) {
+        if (!$err) {
             $this->db->commit();
         }
         else
@@ -1968,19 +1968,19 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         //$module=strtolower($this->name);        TODO When right_class will be same than module name
-        $module=empty($this->rights_class)?strtolower($this->name):$this->rights_class;
+        $module = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
-        $sql.= " WHERE module = '".$this->db->escape($module)."'";
-        $sql.= " AND entity = ".$conf->entity;
+        $sql .= " WHERE module = '".$this->db->escape($module)."'";
+        $sql .= " AND entity = ".$conf->entity;
 
         dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if (! $resql) {
-            $this->error=$this->db->lasterror();
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $this->error = $this->db->lasterror();
             $err++;
         }
 
@@ -1998,24 +1998,24 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $langs, $conf;
 
-        $err=0;
+        $err = 0;
 
         if (isset($this->dirs) && is_array($this->dirs)) {
             foreach ($this->dirs as $key => $value)
             {
-                $addtodatabase=0;
+                $addtodatabase = 0;
 
-                if (! is_array($value)) { $dir=$value;    // Default simple mode
+                if (!is_array($value)) { $dir = $value; // Default simple mode
                 } else {
                     $constname = $this->const_name."_DIR_";
                     $dir       = $this->dirs[$key][1];
-                    $addtodatabase = empty($this->dirs[$key][2])?'':$this->dirs[$key][2]; // Create constante in llx_const
-                    $subname   = empty($this->dirs[$key][3])?'':strtoupper($this->dirs[$key][3]); // Add submodule name (ex: $conf->module->submodule->dir_output)
-                    $forcename = empty($this->dirs[$key][4])?'':strtoupper($this->dirs[$key][4]); // Change the module name if different
+                    $addtodatabase = empty($this->dirs[$key][2]) ? '' : $this->dirs[$key][2]; // Create constante in llx_const
+                    $subname   = empty($this->dirs[$key][3]) ? '' : strtoupper($this->dirs[$key][3]); // Add submodule name (ex: $conf->module->submodule->dir_output)
+                    $forcename = empty($this->dirs[$key][4]) ? '' : strtoupper($this->dirs[$key][4]); // Change the module name if different
 
-                    if (! empty($forcename)) { $constname = 'MAIN_MODULE_'.$forcename."_DIR_";
+                    if (!empty($forcename)) { $constname = 'MAIN_MODULE_'.$forcename."_DIR_";
                     }
-                    if (! empty($subname)) {   $constname = $constname.$subname."_";
+                    if (!empty($subname)) {   $constname = $constname.$subname."_";
                     }
 
                     $name = $constname.strtoupper($this->dirs[$key][0]);
@@ -2026,7 +2026,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 } else { $fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir;
                 }
                 // Create dir if it does not exists
-                if (! empty($fulldir) && ! file_exists($fulldir)) {
+                if (!empty($fulldir) && !file_exists($fulldir)) {
                     if (dol_mkdir($fulldir, DOL_DATA_ROOT) < 0) {
                          $this->error = $langs->trans("ErrorCanNotCreateDir", $fulldir);
                          dol_syslog(get_class($this)."::_init ".$this->error, LOG_ERR);
@@ -2035,7 +2035,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 }
 
                 // Define the constant in database if requested (not the default mode)
-                if (! empty($addtodatabase)) {
+                if (!empty($addtodatabase)) {
                     $result = $this->insert_dirs($name, $dir);
                     if ($result) { $err++;
                     }
@@ -2061,21 +2061,21 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         $sql = "SELECT count(*)";
-        $sql.= " FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
-        $sql.= " AND entity = ".$conf->entity;
+        $sql .= " FROM ".MAIN_DB_PREFIX."const";
+        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
+        $sql .= " AND entity = ".$conf->entity;
 
         dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result) {
             $row = $this->db->fetch_row($result);
 
             if ($row[0] == 0) {
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
-                $sql.= " VALUES (".$this->db->encrypt($name, 1).",'chaine',".$this->db->encrypt($dir, 1).",'Directory for module ".$this->name."','0',".$conf->entity.")";
+                $sql .= " VALUES (".$this->db->encrypt($name, 1).",'chaine',".$this->db->encrypt($dir, 1).",'Directory for module ".$this->name."','0',".$conf->entity.")";
 
                 dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
                 $this->db->query($sql);
@@ -2083,7 +2083,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $err++;
         }
 
@@ -2102,15 +2102,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
+        $err = 0;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_DIR_%'";
-        $sql.= " AND entity = ".$conf->entity;
+        $sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_DIR_%'";
+        $sql .= " AND entity = ".$conf->entity;
 
         dol_syslog(get_class($this)."::delete_dirs", LOG_DEBUG);
-        if (! $this->db->query($sql)) {
-            $this->error=$this->db->lasterror();
+        if (!$this->db->query($sql)) {
+            $this->error = $this->db->lasterror();
             $err++;
         }
 
@@ -2128,15 +2128,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $error=0;
+        $error = 0;
 
-        if (is_array($this->module_parts) && ! empty($this->module_parts)) {
-            foreach($this->module_parts as $key => $value)
+        if (is_array($this->module_parts) && !empty($this->module_parts)) {
+            foreach ($this->module_parts as $key => $value)
             {
-                if (is_array($value) && count($value) == 0) { continue;    // Discard empty arrays
+                if (is_array($value) && count($value) == 0) { continue; // Discard empty arrays
                 }
 
-                $entity=$conf->entity; // Reset the current entity
+                $entity = $conf->entity; // Reset the current entity
                 $newvalue = $value;
 
                 // Serialize array parameters
@@ -2160,29 +2160,29 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
                 }
 
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";
-                $sql.= "name";
-                $sql.= ", type";
-                $sql.= ", value";
-                $sql.= ", note";
-                $sql.= ", visible";
-                $sql.= ", entity";
-                $sql.= ")";
-                $sql.= " VALUES (";
-                $sql.= $this->db->encrypt($this->const_name."_".strtoupper($key), 1);
-                $sql.= ", 'chaine'";
-                $sql.= ", ".$this->db->encrypt($newvalue, 1);
-                $sql.= ", null";
-                $sql.= ", '0'";
-                $sql.= ", ".$entity;
-                $sql.= ")";
+                $sql .= "name";
+                $sql .= ", type";
+                $sql .= ", value";
+                $sql .= ", note";
+                $sql .= ", visible";
+                $sql .= ", entity";
+                $sql .= ")";
+                $sql .= " VALUES (";
+                $sql .= $this->db->encrypt($this->const_name."_".strtoupper($key), 1);
+                $sql .= ", 'chaine'";
+                $sql .= ", ".$this->db->encrypt($newvalue, 1);
+                $sql .= ", null";
+                $sql .= ", '0'";
+                $sql .= ", ".$entity;
+                $sql .= ")";
 
                 dol_syslog(get_class($this)."::insert_module_parts for key=".$this->const_name."_".strtoupper($key), LOG_DEBUG);
 
-                $resql=$this->db->query($sql, 1);
-                if (! $resql) {
+                $resql = $this->db->query($sql, 1);
+                if (!$resql) {
                     if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                          $error++;
-                         $this->error=$this->db->lasterror();
+                         $this->error = $this->db->lasterror();
                     }
                     else
                     {
@@ -2205,23 +2205,23 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
         // phpcs:enable
         global $conf;
 
-        $err=0;
-        $entity=$conf->entity;
+        $err = 0;
+        $entity = $conf->entity;
 
-        if (is_array($this->module_parts) && ! empty($this->module_parts)) {
-            foreach($this->module_parts as $key => $value)
+        if (is_array($this->module_parts) && !empty($this->module_parts)) {
+            foreach ($this->module_parts as $key => $value)
             {
                 // If entity is defined
                 if (is_array($value) && isset($value['entity'])) { $entity = $value['entity'];
                 }
 
                 $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-                $sql.= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_".strtoupper($key)."'";
-                $sql.= " AND entity = ".$entity;
+                $sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_".strtoupper($key)."'";
+                $sql .= " AND entity = ".$entity;
 
                 dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
-                if (! $this->db->query($sql)) {
-                    $this->error=$this->db->lasterror();
+                if (!$this->db->query($sql)) {
+                    $this->error = $this->db->lasterror();
                     $err++;
                 }
             }
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index df1870de0d9..2184500db8c 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -219,7 +219,7 @@ class modAgenda extends DolibarrModules
         );
         $r++;
 
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=0',
 			'type'=>'left',
 			'titre'=>'Actions',
@@ -233,7 +233,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2,
 		);
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=1',
 			'type'=>'left',
 			'titre'=>'NewAction',
@@ -248,7 +248,7 @@ class modAgenda extends DolibarrModules
 		);
 		$r++;
 		// Calendar
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=1',
 			'type'=>'left',
 			'titre'=>'Calendar',
@@ -262,7 +262,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=3',
 			'type'=>'left',
 			'titre'=>'MenuToDoMyActions',
@@ -276,7 +276,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=3',
 			'type'=>'left',
 			'titre'=>'MenuDoneMyActions',
@@ -290,7 +290,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=3',
 			'type'=>'left',
 			'titre'=>'MenuToDoActions',
@@ -304,7 +304,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=3',
 			'type'=>'left',
 			'titre'=>'MenuDoneActions',
@@ -320,7 +320,7 @@ class modAgenda extends DolibarrModules
 
 		// List
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=1',
 			'type'=>'left',
 			'titre'=>'List',
@@ -334,7 +334,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=8',
 			'type'=>'left',
 			'titre'=>'MenuToDoMyActions',
@@ -348,7 +348,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=8',
 			'type'=>'left',
 			'titre'=>'MenuDoneMyActions',
@@ -362,7 +362,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=8',
 			'type'=>'left',
 			'titre'=>'MenuToDoActions',
@@ -376,7 +376,7 @@ class modAgenda extends DolibarrModules
 			'user'=>2
 		);
 		$r++;
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=8',
 			'type'=>'left',
 			'titre'=>'MenuDoneActions',
@@ -391,7 +391,7 @@ class modAgenda extends DolibarrModules
 		);
 		$r++;
 		// Reports
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu'=>'r=1',
 			'type'=>'left',
 			'titre'=>'Reportings',
@@ -406,7 +406,7 @@ class modAgenda extends DolibarrModules
 		);
 		$r++;
 		// Categories
-		$this->menu[$r]=array(
+		$this->menu[$r] = array(
 			'fk_menu' => 'r=1',
 			'type' => 'left',
 			'titre' => 'Categories',
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 6e5924945c9..ca1a8d22209 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -25,7 +25,7 @@
  *	\brief      Fichier de description et activation du module Utilisateur
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe and enable module User
@@ -45,7 +45,7 @@ class modUser extends DolibarrModules
 		$this->db = $db;
 		$this->numero = 0;
 
-		$this->family = "hr";		// Family for module (or "base" if core module)
+		$this->family = "hr"; // Family for module (or "base" if core module)
 		$this->module_position = '05';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
@@ -55,7 +55,7 @@ class modUser extends DolibarrModules
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='group';
+		$this->picto = 'group';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/users/temp");
@@ -64,28 +64,28 @@ class modUser extends DolibarrModules
 		$this->config_page_url = array("user.php");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->langfiles = array("main","users","companies","members","salaries","hrm");
-		$this->always_enabled = true;	// Can't be disabled
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->langfiles = array("main", "users", "companies", "members", "salaries", "hrm");
+		$this->always_enabled = true; // Can't be disabled
 
 		// Constants
 		$this->const = array();
 
 		// Boxes
 		$this->boxes = array(
-		    0=>array('file'=>'box_lastlogin.php','enabledbydefaulton'=>'Home'),
-            1=>array('file'=>'box_birthdays.php','enabledbydefaulton'=>'Home')
+		    0=>array('file'=>'box_lastlogin.php', 'enabledbydefaulton'=>'Home'),
+            1=>array('file'=>'box_birthdays.php', 'enabledbydefaulton'=>'Home')
 		);
 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'user';
-		$this->rights_admin_allowed = 1;	// Admin is always granted of permission (even when module is disabled)
-		$r=0;
+		$this->rights_admin_allowed = 1; // Admin is always granted of permission (even when module is disabled)
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 251;
@@ -140,7 +140,7 @@ class modUser extends DolibarrModules
 		$this->rights[$r][1] = 'Consulter ses propres permissions';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'self_advance';        // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'self_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'readperms';
 
 		$r++;
@@ -164,7 +164,7 @@ class modUser extends DolibarrModules
 		$this->rights[$r][1] = 'Modifier ses propres permissions';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'self_advance';          // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'self_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'writeperms';
 
 		$r++;
@@ -172,7 +172,7 @@ class modUser extends DolibarrModules
 		$this->rights[$r][1] = 'Consulter les groupes';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'group_advance';        // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'group_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'read';
 
 		$r++;
@@ -180,7 +180,7 @@ class modUser extends DolibarrModules
 		$this->rights[$r][1] = 'Consulter les permissions des groupes';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'group_advance';       // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'group_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'readperms';
 
 		$r++;
@@ -188,7 +188,7 @@ class modUser extends DolibarrModules
 		$this->rights[$r][1] = 'Creer/modifier les groupes et leurs permissions';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'group_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'group_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'write';
 
 		$r++;
@@ -196,7 +196,7 @@ class modUser extends DolibarrModules
 		$this->rights[$r][1] = 'Supprimer ou desactiver les groupes';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'group_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'group_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'delete';
 
 		$r++;
@@ -209,118 +209,118 @@ class modUser extends DolibarrModules
 
 
         // Menus
-        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+        $this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='List of users and attributes';
-		$this->export_permission[$r]=array(array("user","user","export"));
-		$this->export_fields_array[$r]=array(
-		    'u.rowid'=>"Id",'u.login'=>"Login",'u.lastname'=>"Lastname",'u.firstname'=>"Firstname",'u.employee'=>"Employee",'u.job'=>"PostOrFunction",'u.gender'=>"Gender",
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'List of users and attributes';
+		$this->export_permission[$r] = array(array("user", "user", "export"));
+		$this->export_fields_array[$r] = array(
+		    'u.rowid'=>"Id", 'u.login'=>"Login", 'u.lastname'=>"Lastname", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
 		    'u.accountancy_code'=>"UserAccountancyCode",
-		    'u.address'=>"Address",'u.zip'=>"Zip",'u.town'=>"Town",
-		    'u.office_phone'=>'Phone','u.user_mobile'=>"Mobile",'u.office_fax'=>'Fax',
-		    'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature',
-		    'u.fk_user'=>'HierarchicalResponsible','u.thm'=>'THM','u.tjm'=>'TJM','u.weeklyhours'=>'WeeklyHours',
-		    'u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey',
+		    'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
+		    'u.office_phone'=>'Phone', 'u.user_mobile'=>"Mobile", 'u.office_fax'=>'Fax',
+		    'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
+		    'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
+		    'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
 		    'u.birth'=>'BirthdayDate',
-		    'u.datec'=>"DateCreation",'u.tms'=>"DateLastModification",
-			'u.admin'=>"Administrator",'u.statut'=>'Status','u.datelastlogin'=>'LastConnexion','u.datepreviouslogin'=>'PreviousConnexion',
-			'u.fk_socpeople'=>"IdContact",'u.fk_soc'=>"IdCompany",'u.fk_member'=>"MemberId"
+		    'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification",
+			'u.admin'=>"Administrator", 'u.statut'=>'Status', 'u.datelastlogin'=>'LastConnexion', 'u.datepreviouslogin'=>'PreviousConnexion',
+			'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany", 'u.fk_member'=>"MemberId"
 		);
-		$this->export_TypeFields_array[$r]=array(
-			'u.rowid'=>'Numeric', 'u.login'=>"Text",'u.lastname'=>"Text",'u.firstname'=>"Text",'u.employee'=>'Boolean','u.job'=>'Text',
+		$this->export_TypeFields_array[$r] = array(
+			'u.rowid'=>'Numeric', 'u.login'=>"Text", 'u.lastname'=>"Text", 'u.firstname'=>"Text", 'u.employee'=>'Boolean', 'u.job'=>'Text',
 		    'u.accountancy_code'=>'Text',
-		    'u.address'=>"Text",'u.zip'=>"Text",'u.town'=>"Text",
-		    'u.office_phone'=>'Text','u.user_mobile'=>'Text','u.office_fax'=>'Text',
-			'u.email'=>'Text','u.datec'=>"Date",'u.tms'=>"Date",'u.admin'=>"Boolean",'u.statut'=>'Status','u.note'=>"Text",'u.datelastlogin'=>'Date',
+		    'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
+		    'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
+			'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note'=>"Text", 'u.datelastlogin'=>'Date',
 		    'u.fk_user'=>"List:user:login",
 		    'u.birth'=>'Date',
-		    'u.datepreviouslogin'=>'Date','u.fk_soc'=>"List:societe:nom:rowid",'u.fk_member'=>"List:adherent:firstname"
+		    'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname"
 		);
-		$this->export_entities_array[$r]=array(
-			'u.rowid'=>"user",'u.login'=>"user",'u.lastname'=>"user",'u.firstname'=>"user",'u.employee'=>'user','u.job'=>'user','u.gender'=>'user',
+		$this->export_entities_array[$r] = array(
+			'u.rowid'=>"user", 'u.login'=>"user", 'u.lastname'=>"user", 'u.firstname'=>"user", 'u.employee'=>'user', 'u.job'=>'user', 'u.gender'=>'user',
 		    'u.accountancy_code'=>'user',
-		    'u.address'=>"user",'u.zip'=>"user",'u.town'=>"user",
-		    'u.office_phone'=>'user','u.user_mobile'=>'user','u.office_fax'=>'user',
-		    'u.email'=>'user','u.note'=>"user",'u.signature'=>'user',
-		    'u.fk_user'=>'user','u.thm'=>'user','u.tjm'=>'user','u.weeklyhours'=>'user',
-		    'u.dateemployment'=>'user','u.salary'=>'user','u.color'=>'user','u.api_key'=>'user',
+		    'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
+		    'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
+		    'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
+		    'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
+		    'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
 		    'u.birth'=>'user',
-		    'u.datec'=>"user",'u.tms'=>"user",
-		    'u.admin'=>"user",'u.statut'=>'user','u.datelastlogin'=>'user','u.datepreviouslogin'=>'user',
-		    'u.fk_socpeople'=>"contact",'u.fk_soc'=>"company",'u.fk_member'=>"member"
+		    'u.datec'=>"user", 'u.tms'=>"user",
+		    'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
+		    'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member"
 		);
         if (empty($conf->adherent->enabled))
         {
             unset($this->export_fields_array[$r]['u.fk_member']);
             unset($this->export_entities_array[$r]['u.fk_member']);
         }
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'user as u';
-		$this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user').')';
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'user as u';
+		$this->export_sql_end[$r] .= ' WHERE u.entity IN ('.getEntity('user').')';
 
 		// Imports
-		$r=0;
+		$r = 0;
 
 		// Import list of users attributes
 		$r++;
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
-		$this->import_label[$r]='ImportDataset_user_1';
-		$this->import_icon[$r]='user';
-		$this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r]=array('u'=>MAIN_DB_PREFIX.'user','extra'=>MAIN_DB_PREFIX.'user_extrafields');	// List of tables to insert into (insert done in same order)
-		$this->import_fields_array[$r]=array(
-		    'u.login'=>"Login*",'u.lastname'=>"Name*",'u.firstname'=>"Firstname",'u.employee'=>"Employee*",'u.job'=>"PostOrFunction",'u.gender'=>"Gender",
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = 'ImportDataset_user_1';
+		$this->import_icon[$r] = 'user';
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('u'=>MAIN_DB_PREFIX.'user', 'extra'=>MAIN_DB_PREFIX.'user_extrafields'); // List of tables to insert into (insert done in same order)
+		$this->import_fields_array[$r] = array(
+		    'u.login'=>"Login*", 'u.lastname'=>"Name*", 'u.firstname'=>"Firstname", 'u.employee'=>"Employee*", 'u.job'=>"PostOrFunction", 'u.gender'=>"Gender",
 		    'u.accountancy_code'=>"UserAccountancyCode",
-			'u.pass_crypted'=>"Password",'u.admin'=>"Administrator",'u.fk_soc'=>"Company*",'u.address'=>"Address",'u.zip'=>"Zip",'u.town'=>"Town",
-			'u.fk_state'=>"StateId",'u.fk_country'=>"CountryCode",
-		    'u.office_phone'=>"Phone",'u.user_mobile'=>"Mobile",'u.office_fax'=>"Fax",
-		    'u.email'=>"Email",'u.note'=>"Note",'u.signature'=>'Signature',
-		    'u.fk_user'=>'HierarchicalResponsible','u.thm'=>'THM','u.tjm'=>'TJM','u.weeklyhours'=>'WeeklyHours',
-			'u.dateemployment'=>'DateEmployment','u.salary'=>'Salary','u.color'=>'Color','u.api_key'=>'ApiKey',
+			'u.pass_crypted'=>"Password", 'u.admin'=>"Administrator", 'u.fk_soc'=>"Company*", 'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
+			'u.fk_state'=>"StateId", 'u.fk_country'=>"CountryCode",
+		    'u.office_phone'=>"Phone", 'u.user_mobile'=>"Mobile", 'u.office_fax'=>"Fax",
+		    'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
+		    'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
+			'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
 		    'u.birth'=>'BirthdayDate',
 		    'u.datec'=>"DateCreation",
 		    'u.statut'=>'Status'
 		);
 		// Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' AND entity IN (0,".$conf->entity.")";
-		$resql=$this->db->query($sql);
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' AND entity IN (0,".$conf->entity.")";
+		$resql = $this->db->query($sql);
 		if ($resql)    // This can fail when class is used on old database (during migration for example)
 		{
-		    while ($obj=$this->db->fetch_object($resql))
+		    while ($obj = $this->db->fetch_object($resql))
 		    {
-		        $fieldname='extra.'.$obj->name;
-		        $fieldlabel=ucfirst($obj->label);
-		        $this->import_fields_array[$r][$fieldname]=$fieldlabel.($obj->fieldrequired?'*':'');
+		        $fieldname = 'extra.'.$obj->name;
+		        $fieldlabel = ucfirst($obj->label);
+		        $this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 		    }
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r]=array('u.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'user');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_convertvalue_array[$r]=array(
-			'u.fk_state'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cstate.class.php','class'=>'Cstate','method'=>'fetch','dict'=>'DictionaryState'),
-		    'u.fk_country'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'),
+		$this->import_fieldshidden_array[$r] = array('u.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'user'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
+		$this->import_convertvalue_array[$r] = array(
+			'u.fk_state'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/cstate.class.php', 'class'=>'Cstate', 'method'=>'fetch', 'dict'=>'DictionaryState'),
+		    'u.fk_country'=>array('rule'=>'fetchidfromcodeid', 'classfile'=>'/core/class/ccountry.class.php', 'class'=>'Ccountry', 'method'=>'fetch', 'dict'=>'DictionaryCountry'),
 		    'u.salary'=>array('rule'=>'numeric')
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
-		$this->import_regex_array[$r]=array(
+		$this->import_regex_array[$r] = array(
 			'u.employee'=>'^[0|1]',
 			'u.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$',
             'u.dateemployment'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
             'u.birth'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'
 		);
-		$this->import_examplevalues_array[$r]=array(
+		$this->import_examplevalues_array[$r] = array(
 			'u.lastname'=>"Doe", 'u.firstname'=>'John', 'u.login'=>'jdoe', 'u.employee'=>'0 or 1',
 			'u.fk_soc'=>'0 (internal user) or company name (external user)', 'u.datec'=>dol_print_date(dol_now(), '%Y-%m-%d'), 'u.address'=>"61 jump street",
-			'u.zip'=>"123456",'u.town'=>"Big town",'u.fk_country'=>'US, FR, DE...','u.office_phone'=>"0101010101",'u.office_fax'=>"0101010102",
-			'u.email'=>"test@mycompany.com",'u.salary'=>"10000",'u.note'=>"This is an example of note for record",'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00",
+			'u.zip'=>"123456", 'u.town'=>"Big town", 'u.fk_country'=>'US, FR, DE...', 'u.office_phone'=>"0101010101", 'u.office_fax'=>"0101010102",
+			'u.email'=>"test@mycompany.com", 'u.salary'=>"10000", 'u.note'=>"This is an example of note for record", 'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00",
 		    'u.statut'=>"0 (closed) or 1 (active)",
 		);
-		$this->import_updatekeys_array[$r]=array('u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>'Login');
+		$this->import_updatekeys_array[$r] = array('u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>'Login');
 	}
 
 
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index a8f19b542e5..f7ff3565e10 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -242,10 +242,10 @@ if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$search_type_thirdp
 if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
 if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_datedelivery_start)	$sql .= " AND e.date_delivery >= '" . $db->idate($search_datedelivery_start) . "'";
-if ($search_datedelivery_end)	$sql .= " AND e.date_delivery <= '" . $db->idate($search_datedelivery_end) . "'";
-if ($search_datereceipt_start)	$sql .= " AND l.date_delivery >= '" . $db->idate($search_datereceipt_start) . "'";
-if ($search_datereceipt_end)	$sql .= " AND l.date_delivery <= '" . $db->idate($search_datereceipt_end) . "'";
+if ($search_datedelivery_start)	$sql .= " AND e.date_delivery >= '".$db->idate($search_datedelivery_start)."'";
+if ($search_datedelivery_end)	$sql .= " AND e.date_delivery <= '".$db->idate($search_datedelivery_end)."'";
+if ($search_datereceipt_start)	$sql .= " AND l.date_delivery >= '".$db->idate($search_datereceipt_start)."'";
+if ($search_datereceipt_end)	$sql .= " AND l.date_delivery <= '".$db->idate($search_datereceipt_end)."'";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 
 // Add where from extra fields
@@ -409,12 +409,12 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From') . ' ';
-		print $form->selectDate($search_delivery_start?$search_delivery_start:-1, 'search_delivery_start', 0, 0, 1);
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_delivery_start ? $search_delivery_start : -1, 'search_delivery_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to') . ' ';
-		print $form->selectDate($search_delivery_end?$search_delivery_end:-1, 'search_delivery_end', 0, 0, 1);
+		print $langs->trans('to').' ';
+		print $form->selectDate($search_delivery_end ? $search_delivery_end : -1, 'search_delivery_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}
@@ -430,12 +430,12 @@ if ($resql)
 		// Date received
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From') . ' ';
-		print $form->selectDate($search_receipt_start?$search_receipt_start:-1, 'search_receipt_start', 0, 0, 1);
+		print $langs->trans('From').' ';
+		print $form->selectDate($search_receipt_start ? $search_receipt_start : -1, 'search_receipt_start', 0, 0, 1);
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to') . ' ';
-		print $form->selectDate($search_receipt_end?$search_receipt_end:-1, 'search_receipt_end', 0, 0, 1);
+		print $langs->trans('to').' ';
+		print $form->selectDate($search_receipt_end ? $search_receipt_end : -1, 'search_receipt_end', 0, 0, 1);
 		print '</div>';
 		print '</td>';
 	}
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 06813b03ae5..5e524a6219a 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -35,27 +35,27 @@ class Export
      */
     public $db;
 
-    public $array_export_code=array();             // Tableau de "idmodule_numlot"
-    public $array_export_module=array();           // Tableau de "nom de modules"
-    public $array_export_label=array();            // Tableau de "libelle de lots"
-    public $array_export_sql_start=array();        // Tableau des "requetes sql"
-    public $array_export_sql_end=array();          // Tableau des "requetes sql"
-    public $array_export_sql_order=array();        // Tableau des "requetes sql"
+    public $array_export_code = array(); // Tableau de "idmodule_numlot"
+    public $array_export_module = array(); // Tableau de "nom de modules"
+    public $array_export_label = array(); // Tableau de "libelle de lots"
+    public $array_export_sql_start = array(); // Tableau des "requetes sql"
+    public $array_export_sql_end = array(); // Tableau des "requetes sql"
+    public $array_export_sql_order = array(); // Tableau des "requetes sql"
 
-    public $array_export_fields=array();           // Tableau des listes de champ+libelle a exporter
-    public $array_export_TypeFields=array();	   // Tableau des listes de champ+Type de filtre
-    public $array_export_FilterValue=array();	   // Tableau des listes de champ+Valeur a filtrer
-    public $array_export_entities=array();         // Tableau des listes de champ+alias a exporter
-    public $array_export_dependencies=array();     // array of list of entities that must take care of the DISTINCT if a field is added into export
-    public $array_export_special=array();          // array of special operations to do on field
-    public $array_export_examplevalues=array();    // array with examples for fields
-	public $array_export_help=array();			   // array with tooltip help for fields
+    public $array_export_fields = array(); // Tableau des listes de champ+libelle a exporter
+    public $array_export_TypeFields = array(); // Tableau des listes de champ+Type de filtre
+    public $array_export_FilterValue = array(); // Tableau des listes de champ+Valeur a filtrer
+    public $array_export_entities = array(); // Tableau des listes de champ+alias a exporter
+    public $array_export_dependencies = array(); // array of list of entities that must take care of the DISTINCT if a field is added into export
+    public $array_export_special = array(); // array of special operations to do on field
+    public $array_export_examplevalues = array(); // array with examples for fields
+	public $array_export_help = array(); // array with tooltip help for fields
 
     // To store export modules
-    public $hexa;									// List of fields in the export profile
-    public $hexafiltervalue;						// List of search criteria in the export profile
+    public $hexa; // List of fields in the export profile
+    public $hexafiltervalue; // List of search criteria in the export profile
     public $datatoexport;
-    public $model_name;								// Name of export profile
+    public $model_name; // Name of export profile
 
     public $sqlusedforexport;
 
@@ -67,7 +67,7 @@ class Export
 	 */
     public function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
     }
 
 
@@ -82,35 +82,35 @@ class Export
     public function load_arrays($user, $filter = '')
     {
         // phpcs:enable
-        global $langs,$conf,$mysoc;
+        global $langs, $conf, $mysoc;
 
         dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
-        $i=0;
+        $i = 0;
 
         // Define list of modules directories into modulesdir
         require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
         $modulesdir = dolGetModulesDirs();
 
-		foreach($modulesdir as $dir)
+		foreach ($modulesdir as $dir)
 		{
 			// Search available exports
-			$handle=@opendir(dol_osencode($dir));
+			$handle = @opendir(dol_osencode($dir));
 			if (is_resource($handle))
 			{
                 // Search module files
-			    while (($file = readdir($handle))!==false)
+			    while (($file = readdir($handle)) !== false)
 				{
 					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
 					{
-						$modulename=$reg[1];
+						$modulename = $reg[1];
 
 						// Defined if module is enabled
-						$enabled=true;
-						$part=strtolower(preg_replace('/^mod/i', '', $modulename));
-						if ($part == 'propale') $part='propal';
-						if (empty($conf->$part->enabled)) $enabled=false;
+						$enabled = true;
+						$part = strtolower(preg_replace('/^mod/i', '', $modulename));
+						if ($part == 'propale') $part = 'propal';
+						if (empty($conf->$part->enabled)) $enabled = false;
 
 						if ($enabled)
 						{
@@ -122,32 +122,32 @@ class Export
 
 							if (isset($module->export_code) && is_array($module->export_code))
 							{
-							    foreach($module->export_code as $r => $value)
+							    foreach ($module->export_code as $r => $value)
 								{
                                     //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
 								    if ($filter && ($filter != $module->export_code[$r])) continue;
 
                                     // Test if condition to show are ok
-                                    if (! empty($module->export_enabled[$r]) && ! verifCond($module->export_enabled[$r])) continue;
+                                    if (!empty($module->export_enabled[$r]) && !verifCond($module->export_enabled[$r])) continue;
 
                                     // Test if permissions are ok
-									$bool=true;
+									$bool = true;
 									if (isset($module->export_permission))
 									{
-										foreach($module->export_permission[$r] as $val)
+										foreach ($module->export_permission[$r] as $val)
 										{
-	    									$perm=$val;
+	    									$perm = $val;
 	    									//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
-	    									if (! empty($perm[2]))
+	    									if (!empty($perm[2]))
 	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
+	    										$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
 	    									}
 	    									else
 	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]};
+	    										$bool = $user->rights->{$perm[0]}->{$perm[1]};
 	    									}
-	    									if ($perm[0]=='user' && $user->admin) $bool=true;
-	    									if (! $bool) break;
+	    									if ($perm[0] == 'user' && $user->admin) $bool = true;
+	    									if (!$bool) break;
 										}
 									}
 									//print $bool." $perm[0]"."<br>";
@@ -156,47 +156,47 @@ class Export
 									//	          if ($bool)
 									//	          {
 									// Charge fichier lang en rapport
-									$langtoload=$module->getLangFilesArray();
+									$langtoload = $module->getLangFilesArray();
 									if (is_array($langtoload))
 									{
-										foreach($langtoload as $key)
+										foreach ($langtoload as $key)
 										{
 											$langs->load($key);
 										}
 									}
 
 									// Module
-									$this->array_export_module[$i]=$module;
+									$this->array_export_module[$i] = $module;
 									// Permission
-									$this->array_export_perms[$i]=$bool;
+									$this->array_export_perms[$i] = $bool;
 									// Icon
-									$this->array_export_icon[$i]=(isset($module->export_icon[$r])?$module->export_icon[$r]:$module->picto);
+									$this->array_export_icon[$i] = (isset($module->export_icon[$r]) ? $module->export_icon[$r] : $module->picto);
 									// Code du dataset export
-									$this->array_export_code[$i]=$module->export_code[$r];
+									$this->array_export_code[$i] = $module->export_code[$r];
 									// Libelle du dataset export
-									$this->array_export_label[$i]=$module->getExportDatasetLabel($r);
+									$this->array_export_label[$i] = $module->getExportDatasetLabel($r);
 									// Tableau des champ a exporter (cle=champ, valeur=libelle)
-									$this->array_export_fields[$i]=$module->export_fields_array[$r];
+									$this->array_export_fields[$i] = $module->export_fields_array[$r];
 									// Tableau des champs a filtrer (cle=champ, valeur1=type de donnees) on verifie que le module a des filtres
-									$this->array_export_TypeFields[$i]=(isset($module->export_TypeFields_array[$r])?$module->export_TypeFields_array[$r]:'');
+									$this->array_export_TypeFields[$i] = (isset($module->export_TypeFields_array[$r]) ? $module->export_TypeFields_array[$r] : '');
 									// Tableau des entites a exporter (cle=champ, valeur=entite)
-									$this->array_export_entities[$i]=$module->export_entities_array[$r];
+									$this->array_export_entities[$i] = $module->export_entities_array[$r];
 									// Tableau des entites qui requiert abandon du DISTINCT (cle=entite, valeur=champ id child records)
-									$this->array_export_dependencies[$i]=(! empty($module->export_dependencies_array[$r])?$module->export_dependencies_array[$r]:'');
+									$this->array_export_dependencies[$i] = (!empty($module->export_dependencies_array[$r]) ? $module->export_dependencies_array[$r] : '');
 									// Tableau des operations speciales sur champ
-									$this->array_export_special[$i]=(! empty($module->export_special_array[$r])?$module->export_special_array[$r]:'');
+									$this->array_export_special[$i] = (!empty($module->export_special_array[$r]) ? $module->export_special_array[$r] : '');
             						// Array of examples
-            						$this->array_export_examplevalues[$i]=$module->export_examplevalues_array[$r];
+            						$this->array_export_examplevalues[$i] = $module->export_examplevalues_array[$r];
             						// Array of help tooltips
-            						$this->array_export_help[$i]=(! empty($module->export_help_array[$r])?$module->export_help_array[$r]:'');
+            						$this->array_export_help[$i] = (!empty($module->export_help_array[$r]) ? $module->export_help_array[$r] : '');
 
 									// Requete sql du dataset
-									$this->array_export_sql_start[$i]=$module->export_sql_start[$r];
-									$this->array_export_sql_end[$i]=$module->export_sql_end[$r];
-									$this->array_export_sql_order[$i]=$module->export_sql_order[$r];
+									$this->array_export_sql_start[$i] = $module->export_sql_start[$r];
+									$this->array_export_sql_end[$i] = $module->export_sql_end[$r];
+									$this->array_export_sql_order[$i] = $module->export_sql_order[$r];
 									//$this->array_export_sql[$i]=$module->export_sql[$r];
 
-									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(! empty($module->export_fields_code[$r])?count($module->export_fields_code[$r]):''));
+									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(!empty($module->export_fields_code[$r]) ?count($module->export_fields_code[$r]) : ''));
 									$i++;
 									//	          }
 								}
@@ -226,42 +226,42 @@ class Export
     {
         // phpcs:enable
 		// Build the sql request
-		$sql=$this->array_export_sql_start[$indice];
-		$i=0;
+		$sql = $this->array_export_sql_start[$indice];
+		$i = 0;
 
 		//print_r($array_selected);
 		foreach ($this->array_export_fields[$indice] as $key => $value)
 		{
-			if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
-            if (preg_match('/^none\./', $key)) continue;                    // A field that must not appears into SQL
-			if ($i > 0) $sql.=', ';
+			if (!array_key_exists($key, $array_selected)) continue; // Field not selected
+            if (preg_match('/^none\./', $key)) continue; // A field that must not appears into SQL
+			if ($i > 0) $sql .= ', ';
 			else $i++;
 
-			if (strpos($key, ' as ')===false) {
-				$newfield=$key.' as '.str_replace(array('.', '-','(',')'), '_', $key);
+			if (strpos($key, ' as ') === false) {
+				$newfield = $key.' as '.str_replace(array('.', '-', '(', ')'), '_', $key);
 			} else {
-				$newfield=$key;
+				$newfield = $key;
 			}
 
-			$sql.=$newfield;
+			$sql .= $newfield;
 		}
-		$sql.=$this->array_export_sql_end[$indice];
+		$sql .= $this->array_export_sql_end[$indice];
 
 		// Add the WHERE part. Filtering into sql if a filtering array is provided
 		if (is_array($array_filterValue) && !empty($array_filterValue))
 		{
-			$sqlWhere='';
+			$sqlWhere = '';
 			// Loop on each condition to add
 			foreach ($array_filterValue as $key => $value)
 			{
 			    if (preg_match('/GROUP_CONCAT/i', $key)) continue;
-				if ($value != '') $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+				if ($value != '') $sqlWhere .= " and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 			}
-			$sql.=$sqlWhere;
+			$sql .= $sqlWhere;
 		}
 
 		// Add the order
-		$sql.=$this->array_export_sql_order[$indice];
+		$sql .= $this->array_export_sql_order[$indice];
 
 		// Add the HAVING part.
 		if (is_array($array_filterValue) && !empty($array_filterValue))
@@ -269,7 +269,7 @@ class Export
 		    // Loop on each condition to add
 		    foreach ($array_filterValue as $key => $value)
 		    {
-		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql .= " HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 		    }
 		}
 
@@ -293,25 +293,25 @@ class Export
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				if (! (strpos($ValueField, '%') === false))
-					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
+				if (!(strpos($ValueField, '%') === false))
+					$szFilterQuery .= " ".$NameField." LIKE '".$ValueField."'";
 				else
-					$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+					$szFilterQuery .= " ".$NameField." = '".$ValueField."'";
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
 				{
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery ="(".$this->conditionDate($NameField, trim($ValueArray[0]), ">=");
-					$szFilterQuery.=" AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")";
+					$szFilterQuery = "(".$this->conditionDate($NameField, trim($ValueArray[0]), ">=");
+					$szFilterQuery .= " AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")";
 				}
 				else
 				{
 					if (is_numeric(substr($ValueField, 0, 1)))
-						$szFilterQuery=$this->conditionDate($NameField, trim($ValueField), "=");
+						$szFilterQuery = $this->conditionDate($NameField, trim($ValueField), "=");
 					else
-						$szFilterQuery=$this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
+						$szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
 				}
 				break;
 			case 'Duree':
@@ -322,29 +322,29 @@ class Export
 				{
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery ="(".$NameField.">=".$ValueArray[0];
-					$szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
+					$szFilterQuery = "(".$NameField.">=".$ValueArray[0];
+					$szFilterQuery .= " AND ".$NameField."<=".$ValueArray[1].")";
 				}
 				else
 				{
 					if (is_numeric(substr($ValueField, 0, 1)))
-						$szFilterQuery=" ".$NameField."=".$ValueField;
+						$szFilterQuery = " ".$NameField."=".$ValueField;
 					else
-						$szFilterQuery=" ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
+						$szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
 				}
 				break;
 			case 'Boolean':
-				$szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
+				$szFilterQuery = " ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField == 'yes' ? 1 : 0));
 				break;
 			case 'Status':
 			case 'List':
 				if (is_numeric($ValueField))
-					$szFilterQuery=" ".$NameField."=".$ValueField;
+					$szFilterQuery = " ".$NameField."=".$ValueField;
 				else {
-                    if (! (strpos($ValueField, '%') === false))
-                        $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
+                    if (!(strpos($ValueField, '%') === false))
+                        $szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
                     else
-                        $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+                        $szFilterQuery = " ".$NameField." = '".$ValueField."'";
 				}
 				break;
 			default:
@@ -365,9 +365,9 @@ class Export
     public function conditionDate($Field, $Value, $Sens)
     {
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
-		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
-		elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
-		else  $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		if (strlen($Value) == 4) $Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
+		elseif (strlen($Value) == 6) $Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
+		else  $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
     }
 
@@ -383,9 +383,9 @@ class Export
     public function build_filterField($TypeField, $NameField, $ValueField)
     {
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$szFilterField='';
+		$szFilterField = '';
 		$InfoFieldList = explode(":", $TypeField);
 
 		// build the input field on depend of the type of file
@@ -393,31 +393,31 @@ class Export
 		{
 			case 'Text':
 			case 'Date':
-				$szFilterField='<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
+				$szFilterField = '<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Duree':
 			case 'Numeric':
 			case 'Number':
 				// Must be a string text to allow to use comparison strings like "<= 999"
-			    $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+			    $szFilterField = '<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Status':
-				$szFilterField='<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				$szFilterField = '<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Boolean':
-				$szFilterField='<select name="'.$NameField.'" class="flat">';
-				$szFilterField.='<option ';
-				if ($ValueField=='') $szFilterField.=' selected ';
-				$szFilterField.=' value="">&nbsp;</option>';
+				$szFilterField = '<select name="'.$NameField.'" class="flat">';
+				$szFilterField .= '<option ';
+				if ($ValueField == '') $szFilterField .= ' selected ';
+				$szFilterField .= ' value="">&nbsp;</option>';
 
-				$szFilterField.='<option ';
-				if ($ValueField=='yes' || $ValueField == '1') $szFilterField.=' selected ';
-				$szFilterField.=' value="1">'.yn(1).'</option>';
+				$szFilterField .= '<option ';
+				if ($ValueField == 'yes' || $ValueField == '1') $szFilterField .= ' selected ';
+				$szFilterField .= ' value="1">'.yn(1).'</option>';
 
-				$szFilterField.='<option ';
-				if ($ValueField=='no' || $ValueField=='0') $szFilterField.=' selected ';
-				$szFilterField.=' value="0">'.yn(0).'</option>';
-				$szFilterField.="</select>";
+				$szFilterField .= '<option ';
+				if ($ValueField == 'no' || $ValueField == '0') $szFilterField .= ' selected ';
+				$szFilterField .= ' value="0">'.yn(0).'</option>';
+				$szFilterField .= "</select>";
 				break;
 			case 'List':
 				// 0 : Type du champ
@@ -426,23 +426,23 @@ class Export
 				// 3 : Name of field with key (if it is not "rowid"). Used this field as key for combo list.
 				// 4 : Name of element for getEntity().
 
-				if (! empty($InfoFieldList[3]))
-					$keyList=$InfoFieldList[3];
+				if (!empty($InfoFieldList[3]))
+					$keyList = $InfoFieldList[3];
 				else
-					$keyList='rowid';
-				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
+					$keyList = 'rowid';
+				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
+				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
 				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[1];
-				if (! empty($InfoFieldList[4])) {
-					$sql.= ' WHERE entity IN ('.getEntity($InfoFieldList[4]).')';
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[1];
+				if (!empty($InfoFieldList[4])) {
+					$sql .= ' WHERE entity IN ('.getEntity($InfoFieldList[4]).')';
 				}
 
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$szFilterField='<select class="flat" name="'.$NameField.'">';
-					$szFilterField.='<option value="0">&nbsp;</option>';
+					$szFilterField = '<select class="flat" name="'.$NameField.'">';
+					$szFilterField .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 
 					$i = 0;
@@ -458,30 +458,30 @@ class Export
 								continue;
 							}
 							//var_dump($InfoFieldList[1]);
-							$labeltoshow=dol_trunc($obj->label, 18);
+							$labeltoshow = dol_trunc($obj->label, 18);
 							if ($InfoFieldList[1] == 'c_stcomm')
 							{
 								$langs->load("companies");
-								$labeltoshow=(($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id)?$langs->trans("StatusProspect".$obj->id):$obj->label);
+								$labeltoshow = (($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id) ? $langs->trans("StatusProspect".$obj->id) : $obj->label);
 							}
 							if ($InfoFieldList[1] == 'c_country')
 							{
 								//var_dump($sql);
 								$langs->load("dict");
-								$labeltoshow=(($langs->trans("Country".$obj->code) != "Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label);
+								$labeltoshow = (($langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label);
 							}
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
-								$szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								$szFilterField .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 							else
 							{
-								$szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
+								$szFilterField .= '<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
 							$i++;
 						}
 					}
-					$szFilterField.="</select>";
+					$szFilterField .= "</select>";
 
 					$this->db->free($resql);
 				}
@@ -502,12 +502,12 @@ class Export
     {
         global $langs;
 
-		$szMsg='';
+		$szMsg = '';
 		$InfoFieldList = explode(":", $TypeField);
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				$szMsg= $langs->trans('ExportStringFilter');
+				$szMsg = $langs->trans('ExportStringFilter');
 				break;
 			case 'Date':
 				$szMsg = $langs->trans('ExportDateFilter');
@@ -542,37 +542,37 @@ class Export
     public function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
     {
         // phpcs:enable
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
-		$indice=0;
+		$indice = 0;
 		asort($array_selected);
 
 		dol_syslog(get_class($this)."::".__FUNCTION__." ".$model.", ".$datatoexport.", ".implode(",", $array_selected));
 
 		// Check parameters or context properties
-		if (empty($this->array_export_fields) || ! is_array($this->array_export_fields))
+		if (empty($this->array_export_fields) || !is_array($this->array_export_fields))
 		{
-			$this->error="ErrorBadParameter";
+			$this->error = "ErrorBadParameter";
 			return -1;
 		}
 
 		// Creation of class to export using model ExportXXX
-		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 		$file = "export_".$model.".modules.php";
 		$classname = "Export".$model;
 		require_once $dir.$file;
 		$objmodel = new $classname($this->db);
 
-		if (! empty($sqlquery)) $sql = $sqlquery;
+		if (!empty($sqlquery)) $sql = $sqlquery;
         else
 		{
 			// Define value for indice from $datatoexport
-			$foundindice=0;
-			foreach($this->array_export_code as $key => $dataset)
+			$foundindice = 0;
+			foreach ($this->array_export_code as $key => $dataset)
 			{
 				if ($datatoexport == $dataset)
 				{
-					$indice=$key;
+					$indice = $key;
 					$foundindice++;
 					//print "Found indice = ".$indice." for dataset=".$datatoexport."\n";
 					break;
@@ -580,31 +580,31 @@ class Export
 			}
 			if (empty($foundindice))
 			{
-				$this->error="ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
+				$this->error = "ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
 				return -1;
 			}
-        	$sql=$this->build_sql($indice, $array_selected, $array_filterValue);
+        	$sql = $this->build_sql($indice, $array_selected, $array_filterValue);
 		}
 
 		// Run the sql
-		$this->sqlusedforexport=$sql;
+		$this->sqlusedforexport = $sql;
 		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			//$this->array_export_label[$indice]
 			if ($conf->global->EXPORT_PREFIX_SPEC)
-				$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
+				$filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
 			else
-				$filename="export_".$datatoexport;
-			$filename.='.'.$objmodel->getDriverExtension();
-			$dirname=$conf->export->dir_temp.'/'.$user->id;
+				$filename = "export_".$datatoexport;
+			$filename .= '.'.$objmodel->getDriverExtension();
+			$dirname = $conf->export->dir_temp.'/'.$user->id;
 
 			$outputlangs = clone $langs; // We clone to have an object we can modify (for example to change output charset by csv handler) without changing original value
 
 			// Open file
 			dol_mkdir($dirname);
-			$result=$objmodel->open_file($dirname."/".$filename, $outputlangs);
+			$result = $objmodel->open_file($dirname."/".$filename, $outputlangs);
 
 			if ($result >= 0)
 			{
@@ -617,61 +617,61 @@ class Export
 				while ($obj = $this->db->fetch_object($resql))
 				{
 					// Process special operations
-					if (! empty($this->array_export_special[$indice]))
+					if (!empty($this->array_export_special[$indice]))
 					{
 						foreach ($this->array_export_special[$indice] as $key => $value)
 						{
-							if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
+							if (!array_key_exists($key, $array_selected)) continue; // Field not selected
 							// Operation NULLIFNEG
-							if ($this->array_export_special[$indice][$key]=='NULLIFNEG')
+							if ($this->array_export_special[$indice][$key] == 'NULLIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'), '_', $key);
-								if ($obj->$alias < 0) $obj->$alias='';
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								if ($obj->$alias < 0) $obj->$alias = '';
 							}
 							// Operation ZEROIFNEG
-							elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
+							elseif ($this->array_export_special[$indice][$key] == 'ZEROIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'), '_', $key);
-								if ($obj->$alias < 0) $obj->$alias='0';
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								if ($obj->$alias < 0) $obj->$alias = '0';
 							}
 							// Operation GETNUMOPENDAYS (for Holiday module)
-							elseif ($this->array_export_special[$indice][$key]=='getNumOpenDays')
+							elseif ($this->array_export_special[$indice][$key] == 'getNumOpenDays')
 							{
 								include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'), '_', $key);
-								$obj->$alias=num_open_day(dol_stringtotime($obj->d_date_debut, 1), dol_stringtotime($obj->d_date_fin, 1), 0, 1, $obj->d_halfday, $mysoc->country_code);
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								$obj->$alias = num_open_day(dol_stringtotime($obj->d_date_debut, 1), dol_stringtotime($obj->d_date_fin, 1), 0, 1, $obj->d_halfday, $mysoc->country_code);
 							}
 							// Operation INVOICEREMAINTOPAY
-							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
+							elseif ($this->array_export_special[$indice][$key] == 'getRemainToPay')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'), '_', $key);
-								$remaintopay='';
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								$remaintopay = '';
 								if ($obj->f_rowid > 0)
 								{
 								    global $tmpobjforcomputecall;
-								    if (! is_object($tmpobjforcomputecall))
+								    if (!is_object($tmpobjforcomputecall))
 								    {
 								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-								        $tmpobjforcomputecall=new Facture($this->db);
+								        $tmpobjforcomputecall = new Facture($this->db);
 								    }
 								    $tmpobjforcomputecall->id = $obj->f_rowid;
 								    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
-								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
+								    $remaintopay = $tmpobjforcomputecall->getRemainToPay();
 								}
-								$obj->$alias=$remaintopay;
+								$obj->$alias = $remaintopay;
 							}
 							else
 							{
 							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
-							    $computestring=$this->array_export_special[$indice][$key];
-							    $tmp=dol_eval($computestring, 1, 0);
-							    $obj->$alias=$tmp;
+							    $computestring = $this->array_export_special[$indice][$key];
+							    $tmp = dol_eval($computestring, 1, 0);
+							    $obj->$alias = $tmp;
 
-							    $this->error="ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
+							    $this->error = "ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
 							    return -1;
 							}
 						}
@@ -690,14 +690,14 @@ class Export
 			}
 			else
 			{
-				$this->error=$objmodel->error;
+				$this->error = $objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error()." - sql=".$sql;
+			$this->error = $this->db->error()." - sql=".$sql;
 			return -1;
 		}
 	}
@@ -716,24 +716,24 @@ class Export
 
 		$this->db->begin();
 
-		$filter='';
+		$filter = '';
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'export_model (';
-		$sql.= 'label,';
-		$sql.= 'type,';
-		$sql.= 'field,';
-		$sql.= 'fk_user,';
-		$sql.= 'filter';
-		$sql.= ') VALUES (';
-		$sql.= "'".$this->db->escape($this->model_name)."',";
-		$sql.= "'".$this->db->escape($this->datatoexport)."',";
-		$sql.= "'".$this->db->escape($this->hexa)."',";
-		$sql.= "'".$user->id."',";
-		$sql.= "'".$this->db->escape($this->hexafiltervalue)."'";
-		$sql.= ")";
+		$sql .= 'label,';
+		$sql .= 'type,';
+		$sql .= 'field,';
+		$sql .= 'fk_user,';
+		$sql .= 'filter';
+		$sql .= ') VALUES (';
+		$sql .= "'".$this->db->escape($this->model_name)."',";
+		$sql .= "'".$this->db->escape($this->datatoexport)."',";
+		$sql .= "'".$this->db->escape($this->hexa)."',";
+		$sql .= "'".$user->id."',";
+		$sql .= "'".$this->db->escape($this->hexafiltervalue)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->db->commit();
@@ -741,8 +741,8 @@ class Export
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			$this->errno=$this->db->lasterrno();
+			$this->error = $this->db->lasterror();
+			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
 			return -1;
 		}
@@ -757,8 +757,8 @@ class Export
     public function fetch($id)
     {
 		$sql = 'SELECT em.rowid, em.label, em.type, em.field, em.filter';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
-		$sql.= ' WHERE em.rowid = '.$id;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
+		$sql .= ' WHERE em.rowid = '.$id;
 
 		dol_syslog("Export::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -778,7 +778,7 @@ class Export
 			}
 			else
 			{
-				$this->error="ModelNotFound";
+				$this->error = "ModelNotFound";
 				return -2;
 			}
 		}
@@ -800,20 +800,20 @@ class Export
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."export_model";
-		$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.
@@ -830,13 +830,13 @@ class Export
 		// 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
 		{
@@ -858,8 +858,8 @@ class Export
 		global $conf, $langs;
 
 		$sql = "SELECT em.rowid, em.field, em.label, em.type, em.filter";
-		$sql.= " FROM ".MAIN_DB_PREFIX."export_model as em";
-		$sql.= " ORDER BY rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."export_model as em";
+		$sql .= " ORDER BY rowid";
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -877,12 +877,12 @@ class Export
 				print $this->array_export_module[$keyModel]->getName().' - ';
 				// recuperation du nom de l'export
 
-				$string=$langs->trans($this->array_export_label[$keyModel]);
-				print ($string!=$this->array_export_label[$keyModel]?$string:$this->array_export_label[$keyModel]);
+				$string = $langs->trans($this->array_export_label[$keyModel]);
+				print ($string != $this->array_export_label[$keyModel] ? $string : $this->array_export_label[$keyModel]);
 				print '</td>';
 				//print '<td>'.$obj->type.$keyModel.'</td>';
 				print '<td>'.str_replace(',', ' , ', $obj->field).'</td>';
-				if (! empty($obj->filter)) {
+				if (!empty($obj->filter)) {
 					$filter = json_decode($obj->filter, true);
 					print '<td>'.str_replace(',', ' , ', $filter['field']).'</td>';
 					print '<td>'.str_replace(',', ' , ', $filter['value']).'</td>';
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 1f00720a12d..dc013c720b0 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -46,27 +46,27 @@ class FactureFournisseur extends CommonInvoice
     /**
 	 * @var string ID to identify managed object
 	 */
-	public $element='invoice_supplier';
+	public $element = 'invoice_supplier';
 
     /**
      * @var string Name of table without prefix where object is stored
      */
-    public $table_element='facture_fourn';
+    public $table_element = 'facture_fourn';
 
     /**
      * @var int    Name of subtable line
      */
-    public $table_element_line='facture_fourn_det';
+    public $table_element_line = 'facture_fourn_det';
 
     /**
      * @var int Field with ID of parent key if this field has a parent
      */
-    public $fk_element='fk_facture_fourn';
+    public $fk_element = 'fk_facture_fourn';
 
     /**
      * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
      */
-    public $picto='bill';
+    public $picto = 'bill';
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -96,7 +96,7 @@ class FactureFournisseur extends CommonInvoice
 	public $ref;
 
 	public $label;
-	public $libelle;		// @deprecated
+	public $libelle; // @deprecated
 
     public $product_ref;
     public $ref_supplier;
@@ -196,9 +196,9 @@ class FactureFournisseur extends CommonInvoice
     public $fk_incoterms;
 
     public $location_incoterms;
-    public $label_incoterms;  //Used into tooltip
+    public $label_incoterms; //Used into tooltip
 
-    public $extraparams=array();
+    public $extraparams = array();
 
 	// Multicurrency
 	/**
@@ -317,86 +317,86 @@ class FactureFournisseur extends CommonInvoice
 
         $this->db->begin();
 
-        if (! $remise) $remise = 0 ;
+        if (!$remise) $remise = 0;
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (";
-		$sql.= "ref";
-        $sql.= ", ref_supplier";
-        $sql.= ", entity";
-        $sql.= ", type";
-        $sql.= ", libelle";
-        $sql.= ", fk_soc";
-        $sql.= ", datec";
-        $sql.= ", datef";
-		$sql.= ", fk_projet";
-		$sql.= ", fk_cond_reglement";
-		$sql.= ", fk_mode_reglement";
-        $sql.= ", fk_account";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", fk_user_author";
-        $sql.= ", date_lim_reglement";
-		$sql.= ", fk_incoterms, location_incoterms";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ", fk_facture_source";
-        $sql.= ")";
-        $sql.= " VALUES (";
-		$sql.= "'(PROV)'";
-        $sql.= ", '".$this->db->escape($this->ref_supplier)."'";
-        $sql.= ", ".$conf->entity;
-        $sql.= ", '".$this->db->escape($this->type)."'";
-        $sql.= ", '".$this->db->escape($this->label?$this->label:$this->libelle)."'";
-        $sql.= ", ".$this->socid;
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ", '".$this->db->idate($this->date)."'";
-		$sql.= ", ".($this->fk_project > 0 ? $this->fk_project:"null");
-		$sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id:"null");
-		$sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id:"null");
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", ".$user->id.",";
-        $sql.= $this->date_echeance!=''?"'".$this->db->idate($this->date_echeance)."'":"null";
-		$sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ", ".(int) $this->fk_multicurrency;
-		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ", ".(isset($this->fk_facture_source)?$this->fk_facture_source:"NULL");
-        $sql.= ")";
+		$sql .= "ref";
+        $sql .= ", ref_supplier";
+        $sql .= ", entity";
+        $sql .= ", type";
+        $sql .= ", libelle";
+        $sql .= ", fk_soc";
+        $sql .= ", datec";
+        $sql .= ", datef";
+		$sql .= ", fk_projet";
+		$sql .= ", fk_cond_reglement";
+		$sql .= ", fk_mode_reglement";
+        $sql .= ", fk_account";
+        $sql .= ", note_private";
+        $sql .= ", note_public";
+        $sql .= ", fk_user_author";
+        $sql .= ", date_lim_reglement";
+		$sql .= ", fk_incoterms, location_incoterms";
+        $sql .= ", fk_multicurrency";
+        $sql .= ", multicurrency_code";
+        $sql .= ", multicurrency_tx";
+        $sql .= ", fk_facture_source";
+        $sql .= ")";
+        $sql .= " VALUES (";
+		$sql .= "'(PROV)'";
+        $sql .= ", '".$this->db->escape($this->ref_supplier)."'";
+        $sql .= ", ".$conf->entity;
+        $sql .= ", '".$this->db->escape($this->type)."'";
+        $sql .= ", '".$this->db->escape($this->label ? $this->label : $this->libelle)."'";
+        $sql .= ", ".$this->socid;
+        $sql .= ", '".$this->db->idate($now)."'";
+        $sql .= ", '".$this->db->idate($this->date)."'";
+		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : "null");
+		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "null");
+        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+        $sql .= ", '".$this->db->escape($this->note_private)."'";
+        $sql .= ", '".$this->db->escape($this->note_public)."'";
+        $sql .= ", ".$user->id.",";
+        $sql .= $this->date_echeance != '' ? "'".$this->db->idate($this->date_echeance)."'" : "null";
+		$sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", ".(int) $this->fk_multicurrency;
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".(double) $this->multicurrency_tx;
+        $sql .= ", ".(isset($this->fk_facture_source) ? $this->fk_facture_source : "NULL");
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn');
 
             // Update ref with new one
-            $this->ref='(PROV'.$this->id.')';
+            $this->ref = '(PROV'.$this->id.')';
             $sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
             dol_syslog(get_class($this)."::create", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (! $resql) $error++;
+            $resql = $this->db->query($sql);
+            if (!$resql) $error++;
 
-        	if (! empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+        	if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
 			{
-				$this->linked_objects = $this->linkedObjectsIds;	// TODO Replace linked_objects with linkedObjectsIds
+				$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 			}
 
 			// Add object linked
-			if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+			if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
 			{
-				foreach($this->linked_objects as $origin => $tmp_origin_id)
+				foreach ($this->linked_objects as $origin => $tmp_origin_id)
 				{
 				    if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
 				    {
-				        foreach($tmp_origin_id as $origin_id)
+				        foreach ($tmp_origin_id as $origin_id)
 				        {
 				            $ret = $this->add_object_linked($origin, $origin_id);
-				            if (! $ret)
+				            if (!$ret)
 				            {
 				                dol_print_error($this->db);
 				                $error++;
@@ -501,28 +501,28 @@ class FactureFournisseur extends CommonInvoice
 			}
 
             // Update total price
-            $result=$this->update_price();
+            $result = $this->update_price();
             if ($result > 0)
             {
 				// Actions on extra fields
             	if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 				{
-					$result=$this->insertExtraFields();               // This also set $this->error or $this->errors if errors are found
+					$result = $this->insertExtraFields(); // This also set $this->error or $this->errors if errors are found
 					if ($result < 0)
 					{
 						$error++;
 					}
 				}
 
-				if (! $error)
+				if (!$error)
 				{
                     // Call trigger
-                    $result=$this->call_trigger('BILL_SUPPLIER_CREATE', $user);
+                    $result = $this->call_trigger('BILL_SUPPLIER_CREATE', $user);
                     if ($result < 0) $error++;
                     // End call triggers
 				}
 
-                if (! $error)
+                if (!$error)
                 {
                     $this->db->commit();
                     return $this->id;
@@ -569,75 +569,75 @@ class FactureFournisseur extends CommonInvoice
         global $langs;
 
         $sql = "SELECT";
-        $sql.= " t.rowid,";
-		$sql.= " t.ref,";
-        $sql.= " t.ref_supplier,";
-        $sql.= " t.entity,";
-        $sql.= " t.type,";
-        $sql.= " t.fk_soc,";
-        $sql.= " t.datec,";
-        $sql.= " t.datef,";
-        $sql.= " t.tms,";
-        $sql.= " t.libelle as label,";
-        $sql.= " t.paye,";
-        $sql.= " t.amount,";
-        $sql.= " t.remise,";
-        $sql.= " t.close_code,";
-        $sql.= " t.close_note,";
-        $sql.= " t.tva,";
-        $sql.= " t.localtax1,";
-        $sql.= " t.localtax2,";
-        $sql.= " t.total_ht,";
-        $sql.= " t.total_tva,";
-        $sql.= " t.total_ttc,";
-        $sql.= " t.fk_statut,";
-        $sql.= " t.fk_user_author,";
-        $sql.= " t.fk_user_valid,";
-        $sql.= " t.fk_facture_source,";
-        $sql.= " t.fk_projet as fk_project,";
-        $sql.= " t.fk_cond_reglement,";
-        $sql.= " t.fk_account,";
-        $sql.= " t.fk_mode_reglement,";
-        $sql.= " t.date_lim_reglement,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
-        $sql.= " t.model_pdf,";
-        $sql.= " t.import_key,";
-        $sql.= " t.extraparams,";
-        $sql.= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
-        $sql.= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle,";
-        $sql.= ' s.nom as socnom, s.rowid as socid,';
-        $sql.= ' t.fk_incoterms, t.location_incoterms,';
-        $sql.= " i.libelle as label_incoterms,";
-        $sql.= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON t.fk_cond_reglement = cr.rowid";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
-        if ($id)  $sql.= " WHERE t.rowid=".$id;
-        if ($ref) $sql.= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity IN (".getEntity('supplier_invoice').")";
+        $sql .= " t.rowid,";
+		$sql .= " t.ref,";
+        $sql .= " t.ref_supplier,";
+        $sql .= " t.entity,";
+        $sql .= " t.type,";
+        $sql .= " t.fk_soc,";
+        $sql .= " t.datec,";
+        $sql .= " t.datef,";
+        $sql .= " t.tms,";
+        $sql .= " t.libelle as label,";
+        $sql .= " t.paye,";
+        $sql .= " t.amount,";
+        $sql .= " t.remise,";
+        $sql .= " t.close_code,";
+        $sql .= " t.close_note,";
+        $sql .= " t.tva,";
+        $sql .= " t.localtax1,";
+        $sql .= " t.localtax2,";
+        $sql .= " t.total_ht,";
+        $sql .= " t.total_tva,";
+        $sql .= " t.total_ttc,";
+        $sql .= " t.fk_statut,";
+        $sql .= " t.fk_user_author,";
+        $sql .= " t.fk_user_valid,";
+        $sql .= " t.fk_facture_source,";
+        $sql .= " t.fk_projet as fk_project,";
+        $sql .= " t.fk_cond_reglement,";
+        $sql .= " t.fk_account,";
+        $sql .= " t.fk_mode_reglement,";
+        $sql .= " t.date_lim_reglement,";
+        $sql .= " t.note_private,";
+        $sql .= " t.note_public,";
+        $sql .= " t.model_pdf,";
+        $sql .= " t.import_key,";
+        $sql .= " t.extraparams,";
+        $sql .= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
+        $sql .= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle,";
+        $sql .= ' s.nom as socnom, s.rowid as socid,';
+        $sql .= ' t.fk_incoterms, t.location_incoterms,';
+        $sql .= " i.libelle as label_incoterms,";
+        $sql .= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON t.fk_cond_reglement = cr.rowid";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
+        if ($id)  $sql .= " WHERE t.rowid=".$id;
+        if ($ref) $sql .= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity IN (".getEntity('supplier_invoice').")";
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $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->ref					= $obj->ref?$obj->ref:$obj->rowid;	// We take rowid if ref is empty for backward compatibility
+                $this->id = $obj->rowid;
+                $this->ref = $obj->ref ? $obj->ref : $obj->rowid; // We take rowid if ref is empty for backward compatibility
 
-                $this->ref_supplier			= $obj->ref_supplier;
+                $this->ref_supplier = $obj->ref_supplier;
                 $this->entity				= $obj->entity;
-                $this->type					= empty($obj->type)? self::TYPE_STANDARD:$obj->type;
+                $this->type					= empty($obj->type) ? self::TYPE_STANDARD : $obj->type;
                 $this->fk_soc				= $obj->fk_soc;
                 $this->datec				= $this->db->jdate($obj->datec);
                 $this->date					= $this->db->jdate($obj->datef);
                 $this->datep				= $this->db->jdate($obj->datef);
-                $this->tms					= $this->db->jdate($obj->tms);
-                $this->libelle				= $obj->label;		// deprecated
+                $this->tms = $this->db->jdate($obj->tms);
+                $this->libelle = $obj->label; // deprecated
                 $this->label				= $obj->label;
                 $this->paye					= $obj->paye;
                 $this->paid					= $obj->paye;
@@ -645,7 +645,7 @@ class FactureFournisseur extends CommonInvoice
                 $this->remise				= $obj->remise;
                 $this->close_code			= $obj->close_code;
                 $this->close_note			= $obj->close_note;
-                $this->tva					= $obj->tva;
+                $this->tva = $obj->tva;
                 $this->total_localtax1		= $obj->localtax1;
                 $this->total_localtax2		= $obj->localtax2;
                 $this->total_ht				= $obj->total_ht;
@@ -758,44 +758,44 @@ class FactureFournisseur extends CommonInvoice
 
 	                $line = new SupplierInvoiceLine($this->db);
 
-                    $line->id				= $obj->rowid;
-                    $line->rowid			= $obj->rowid;
-                    $line->description		= $obj->description;
-                    $line->date_start		= $obj->date_start;
-                    $line->date_end			= $obj->date_end;
+                    $line->id = $obj->rowid;
+                    $line->rowid = $obj->rowid;
+                    $line->description = $obj->description;
+                    $line->date_start = $obj->date_start;
+                    $line->date_end = $obj->date_end;
 
-                    $line->product_ref		= $obj->product_ref;
-                    $line->ref				= $obj->product_ref;
+                    $line->product_ref = $obj->product_ref;
+                    $line->ref = $obj->product_ref;
                     $line->ref_supplier		= $obj->ref_supplier;
                     $line->libelle			= $obj->label;
                     $line->label  			= $obj->label;
                     $line->product_desc		= $obj->product_desc;
-                    $line->subprice			= $obj->pu_ht;
-                    $line->pu_ht			= $obj->pu_ht;
+                    $line->subprice = $obj->pu_ht;
+                    $line->pu_ht = $obj->pu_ht;
                     $line->pu_ttc			= $obj->pu_ttc;
 
-                    $line->vat_src_code     = $obj->vat_src_code;
+                    $line->vat_src_code = $obj->vat_src_code;
                     $line->tva_tx			= $obj->tva_tx;
                     $line->localtax1_tx		= $obj->localtax1_tx;
                     $line->localtax2_tx		= $obj->localtax2_tx;
                     $line->localtax1_type	= $obj->localtax1_type;
                     $line->localtax2_type	= $obj->localtax2_type;
                     $line->qty				= $obj->qty;
-                    $line->remise_percent   = $obj->remise_percent;
-                    $line->tva				= $obj->total_tva;			// deprecated
+                    $line->remise_percent = $obj->remise_percent;
+                    $line->tva				= $obj->total_tva; // deprecated
                     $line->total_ht			= $obj->total_ht;
                     $line->total_ttc		= $obj->total_ttc;
                     $line->total_tva		= $obj->total_tva;
                     $line->total_localtax1	= $obj->total_localtax1;
                     $line->total_localtax2	= $obj->total_localtax2;
-                    $line->fk_facture_fourn     = $obj->fk_facture_fourn;
-                    $line->fk_product		= $obj->fk_product;
+                    $line->fk_facture_fourn = $obj->fk_facture_fourn;
+                    $line->fk_product = $obj->fk_product;
                     $line->product_type		= $obj->product_type;
                     $line->product_label	= $obj->label;
-                    $line->info_bits		= $obj->info_bits;
+                    $line->info_bits = $obj->info_bits;
                     $line->fk_parent_line   = $obj->fk_parent_line;
                     $line->special_code		= $obj->special_code;
-                    $line->rang       		= $obj->rang;
+                    $line->rang = $obj->rang;
                     $line->fk_unit          = $obj->fk_unit;
 
 					// Multicurrency
@@ -832,40 +832,40 @@ class FactureFournisseur extends CommonInvoice
     public function update($user = null, $notrigger = 0)
     {
         global $conf, $langs;
-        $error=0;
+        $error = 0;
 
         // Clean parameters
-        if (empty($this->type)) $this->type= self::TYPE_STANDARD;
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-        if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-        if (isset($this->entity)) $this->entity=trim($this->entity);
-        if (isset($this->type)) $this->type=trim($this->type);
-        if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
-        if (isset($this->label)) $this->label=trim($this->label);
-        if (isset($this->libelle)) $this->libelle=trim($this->libelle);	// deprecated
-        if (isset($this->paye)) $this->paye=trim($this->paye);
-        if (isset($this->amount)) $this->amount=trim($this->amount);
-        if (isset($this->remise)) $this->remise=trim($this->remise);
-        if (isset($this->close_code)) $this->close_code=trim($this->close_code);
-        if (isset($this->close_note)) $this->close_note=trim($this->close_note);
-        if (isset($this->tva)) $this->tva=trim($this->tva);
-        if (isset($this->localtax1)) $this->localtax1=trim($this->localtax1);
-        if (isset($this->localtax2)) $this->localtax2=trim($this->localtax2);
-        if (empty($this->total_ht)) $this->total_ht=0;
-        if (empty($this->total_tva)) $this->total_tva=0;
+        if (empty($this->type)) $this->type = self::TYPE_STANDARD;
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+        if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
+        if (isset($this->entity)) $this->entity = trim($this->entity);
+        if (isset($this->type)) $this->type = trim($this->type);
+        if (isset($this->fk_soc)) $this->fk_soc = trim($this->fk_soc);
+        if (isset($this->label)) $this->label = trim($this->label);
+        if (isset($this->libelle)) $this->libelle = trim($this->libelle); // deprecated
+        if (isset($this->paye)) $this->paye = trim($this->paye);
+        if (isset($this->amount)) $this->amount = trim($this->amount);
+        if (isset($this->remise)) $this->remise = trim($this->remise);
+        if (isset($this->close_code)) $this->close_code = trim($this->close_code);
+        if (isset($this->close_note)) $this->close_note = trim($this->close_note);
+        if (isset($this->tva)) $this->tva = trim($this->tva);
+        if (isset($this->localtax1)) $this->localtax1 = trim($this->localtax1);
+        if (isset($this->localtax2)) $this->localtax2 = trim($this->localtax2);
+        if (empty($this->total_ht)) $this->total_ht = 0;
+        if (empty($this->total_tva)) $this->total_tva = 0;
         //	if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1);
         //	if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2);
-        if (isset($this->total_ttc)) $this->total_ttc=trim($this->total_ttc);
-        if (isset($this->statut)) $this->statut=(int) $this->statut;
-        if (isset($this->author)) $this->author=trim($this->author);
-        if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-        if (isset($this->fk_facture_source)) $this->fk_facture_source=trim($this->fk_facture_source);
-        if (isset($this->fk_project)) $this->fk_project=trim($this->fk_project);
-        if (isset($this->cond_reglement_id)) $this->cond_reglement_id=trim($this->cond_reglement_id);
-        if (isset($this->note_private)) $this->note=trim($this->note_private);
-        if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-        if (isset($this->model_pdf)) $this->model_pdf=trim($this->model_pdf);
-        if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+        if (isset($this->total_ttc)) $this->total_ttc = trim($this->total_ttc);
+        if (isset($this->statut)) $this->statut = (int) $this->statut;
+        if (isset($this->author)) $this->author = trim($this->author);
+        if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
+        if (isset($this->fk_facture_source)) $this->fk_facture_source = trim($this->fk_facture_source);
+        if (isset($this->fk_project)) $this->fk_project = trim($this->fk_project);
+        if (isset($this->cond_reglement_id)) $this->cond_reglement_id = trim($this->cond_reglement_id);
+        if (isset($this->note_private)) $this->note = trim($this->note_private);
+        if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+        if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
+        if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 
 
         // Check parameters
@@ -873,38 +873,38 @@ class FactureFournisseur extends CommonInvoice
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn SET";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-        $sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
-        $sql.= " entity=".(isset($this->entity)?$this->entity:"null").",";
-        $sql.= " type=".(isset($this->type)?$this->type:"null").",";
-        $sql.= " fk_soc=".(isset($this->fk_soc)?$this->fk_soc:"null").",";
-        $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
-        $sql.= " datef=".(dol_strlen($this->date)!=0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
-        if (dol_strlen($this->tms) != 0) $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-        $sql.= " libelle=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " paye=".(isset($this->paye)?$this->paye:"null").",";
-        $sql.= " amount=".(isset($this->amount)?$this->amount:"null").",";
-        $sql.= " remise=".(isset($this->remise)?$this->remise:"null").",";
-        $sql.= " close_code=".(isset($this->close_code)?"'".$this->db->escape($this->close_code)."'":"null").",";
-        $sql.= " close_note=".(isset($this->close_note)?"'".$this->db->escape($this->close_note)."'":"null").",";
-        $sql.= " tva=".(isset($this->tva)?$this->tva:"null").",";
-        $sql.= " localtax1=".(isset($this->localtax1)?$this->localtax1:"null").",";
-        $sql.= " localtax2=".(isset($this->localtax2)?$this->localtax2:"null").",";
-        $sql.= " total_ht=".(isset($this->total_ht)?$this->total_ht:"null").",";
-        $sql.= " total_tva=".(isset($this->total_tva)?$this->total_tva:"null").",";
-        $sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").",";
-        $sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-        $sql.= " fk_user_author=".(isset($this->author)?$this->author:"null").",";
-        $sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
-        $sql.= " fk_facture_source=".(isset($this->fk_facture_source)?$this->fk_facture_source:"null").",";
-        $sql.= " fk_projet=".(isset($this->fk_project)?$this->fk_project:"null").",";
-        $sql.= " fk_cond_reglement=".(isset($this->cond_reglement_id)?$this->cond_reglement_id:"null").",";
-        $sql.= " date_lim_reglement=".(dol_strlen($this->date_echeance)!=0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";
-        $sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-        $sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-        $sql.= " model_pdf=".(isset($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null").",";
-        $sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+        $sql .= " ref_supplier=".(isset($this->ref_supplier) ? "'".$this->db->escape($this->ref_supplier)."'" : "null").",";
+        $sql .= " entity=".(isset($this->entity) ? $this->entity : "null").",";
+        $sql .= " type=".(isset($this->type) ? $this->type : "null").",";
+        $sql .= " fk_soc=".(isset($this->fk_soc) ? $this->fk_soc : "null").",";
+        $sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+        $sql .= " datef=".(dol_strlen($this->date) != 0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
+        if (dol_strlen($this->tms) != 0) $sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+        $sql .= " libelle=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+        $sql .= " paye=".(isset($this->paye) ? $this->paye : "null").",";
+        $sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
+        $sql .= " remise=".(isset($this->remise) ? $this->remise : "null").",";
+        $sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
+        $sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
+        $sql .= " tva=".(isset($this->tva) ? $this->tva : "null").",";
+        $sql .= " localtax1=".(isset($this->localtax1) ? $this->localtax1 : "null").",";
+        $sql .= " localtax2=".(isset($this->localtax2) ? $this->localtax2 : "null").",";
+        $sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
+        $sql .= " total_tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
+        $sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
+        $sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+        $sql .= " fk_user_author=".(isset($this->author) ? $this->author : "null").",";
+        $sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
+        $sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? $this->fk_facture_source : "null").",";
+        $sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
+        $sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
+        $sql .= " date_lim_reglement=".(dol_strlen($this->date_echeance) != 0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";
+        $sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+        $sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+        $sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
+        $sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
+        $sql .= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
@@ -1313,13 +1313,13 @@ class FactureFournisseur extends CommonInvoice
      */
     public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $now=dol_now();
+        $now = dol_now();
 
-        $error=0;
+        $error = 0;
         dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse);
 
         // Force to have object complete for checks
@@ -1385,10 +1385,10 @@ class FactureFournisseur extends CommonInvoice
                         $mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
                         // We increase stock for product
-                        $up_ht_disc=$this->lines[$i]->pu_ht;
-                        if (! empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc=price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
-                        if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
-                        else $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
+                        $up_ht_disc = $this->lines[$i]->pu_ht;
+                        if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+                        if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
+                        else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
                         if ($result < 0) { $error++; }
                         unset($this->line);
                     }
@@ -1412,17 +1412,17 @@ class FactureFournisseur extends CommonInvoice
             	if (preg_match('/^[\(]?PROV/i', $this->ref))
             	{
             		// Now we rename also files into index
-            		$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref)+1).")), filepath = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->db->escape($this->newref)."'";
-            		$sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+            		$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->db->escape($this->newref)."'";
+            		$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->db->escape($this->ref)."' and entity = ".$conf->entity;
             		$resql = $this->db->query($sql);
-            		if (! $resql) { $error++; $this->error = $this->db->lasterror(); }
+            		if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
 
             		// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
             		$oldref = dol_sanitizeFileName($this->ref);
             		$newref = dol_sanitizeFileName($num);
             		$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$oldref;
             		$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$newref;
-            		if (! $error && file_exists($dirsource))
+            		if (!$error && file_exists($dirsource))
             		{
             			dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
 
@@ -1521,16 +1521,16 @@ class FactureFournisseur extends CommonInvoice
                         $mouvP = new MouvementStock($this->db);
                         $mouvP->origin = &$this;
 						// We increase stock for product
-						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
-                        else $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+                        else $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
                     }
                 }
             }
             // Triggers call
-            if (! $error && empty($notrigger))
+            if (!$error && empty($notrigger))
             {
                 // Call trigger
-                $result=$this->call_trigger('BILL_SUPPLIER_UNVALIDATE', $user);
+                $result = $this->call_trigger('BILL_SUPPLIER_UNVALIDATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
@@ -1595,27 +1595,27 @@ class FactureFournisseur extends CommonInvoice
 		if ($this->statut == self::STATUS_DRAFT)
 		{
 			// Clean parameters
-			if (empty($remise_percent)) $remise_percent=0;
-			if (empty($qty)) $qty=0;
-			if (empty($info_bits)) $info_bits=0;
-			if (empty($rang)) $rang=0;
-			if (empty($ventil)) $ventil=0;
-			if (empty($txtva)) $txtva=0;
-			if (empty($txlocaltax1)) $txlocaltax1=0;
-			if (empty($txlocaltax2)) $txlocaltax2=0;
+			if (empty($remise_percent)) $remise_percent = 0;
+			if (empty($qty)) $qty = 0;
+			if (empty($info_bits)) $info_bits = 0;
+			if (empty($rang)) $rang = 0;
+			if (empty($ventil)) $ventil = 0;
+			if (empty($txtva)) $txtva = 0;
+			if (empty($txlocaltax1)) $txlocaltax1 = 0;
+			if (empty($txlocaltax2)) $txlocaltax2 = 0;
 
-			$remise_percent=price2num($remise_percent);
-			$qty=price2num($qty);
-			$pu=price2num($pu);
-			$txlocaltax1=price2num($txlocaltax1);
-			$txlocaltax2=price2num($txlocaltax2);
+			$remise_percent = price2num($remise_percent);
+			$qty = price2num($qty);
+			$pu = price2num($pu);
+			$txlocaltax1 = price2num($txlocaltax1);
+			$txlocaltax2 = price2num($txlocaltax2);
 			if (!preg_match('/\((.*)\)/', $txtva)) {
-				$txtva = price2num($txtva);               // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
+				$txtva = price2num($txtva); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
 			}
 
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
-				$this->error=$langs->trans('ErrorStartDateGreaterEnd');
+				$this->error = $langs->trans('ErrorStartDateGreaterEnd');
 				return -1;
 			}
 
@@ -2191,31 +2191,31 @@ class FactureFournisseur extends CommonInvoice
         global $conf, $langs;
 
         $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
-        if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= ' WHERE ff.paye=0';
-        $sql.= ' AND ff.fk_statut > 0';
-        $sql.= " AND ff.entity = ".$conf->entity;
-        if ($user->socid) $sql.=' AND ff.fk_soc = '.$user->socid;
-        if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
+        if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql .= ' WHERE ff.paye=0';
+        $sql .= ' AND ff.fk_statut > 0';
+        $sql .= " AND ff.entity = ".$conf->entity;
+        if ($user->socid) $sql .= ' AND ff.fk_soc = '.$user->socid;
+        if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
 	        $langs->load("bills");
-	        $now=dol_now();
+	        $now = dol_now();
 
 	        $response = new WorkboardResponse();
-	        $response->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
-	        $response->label=$langs->trans("SupplierBillsToPay");
-	        $response->labelShort=$langs->trans("StatusToPay");
+	        $response->warning_delay = $conf->facture->fournisseur->warning_delay / 60 / 60 / 24;
+	        $response->label = $langs->trans("SupplierBillsToPay");
+	        $response->labelShort = $langs->trans("StatusToPay");
 
-	        $response->url=DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&amp;mainmenu=billing&amp;leftmenu=suppliers_bills';
-	        $response->img=img_object($langs->trans("Bills"), "bill");
+	        $response->url = DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&amp;mainmenu=billing&amp;leftmenu=suppliers_bills';
+	        $response->img = img_object($langs->trans("Bills"), "bill");
 
             $facturestatic = new FactureFournisseur($this->db);
 
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
                 $response->nbtodo++;
 
@@ -2265,58 +2265,58 @@ class FactureFournisseur extends CommonInvoice
         if ($option !== 'nolink')
         {
         	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
-        $picto=$this->picto;
-        if ($this->type == self::TYPE_REPLACEMENT) $picto.='r'; // Replacement invoice
-        if ($this->type == self::TYPE_CREDIT_NOTE) $picto.='a'; // Credit note
-        if ($this->type == self::TYPE_DEPOSIT)     $picto.='d'; // Deposit invoice
+        $picto = $this->picto;
+        if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
+        if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
+        if ($this->type == self::TYPE_DEPOSIT)     $picto .= 'd'; // Deposit invoice
 
-        $label = '<u>' . $langs->trans("ShowSupplierInvoice") . '</u>';
-        if (! empty($this->ref))
-            $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
-        if (! empty($this->ref_supplier))
-            $label.= '<br><b>' . $langs->trans('RefSupplier') . ':</b> ' . $this->ref_supplier;
-        if (! empty($this->label))
-        	$label.= '<br><b>' . $langs->trans('Label') . ':</b> ' . $this->label;
-        if (! empty($this->date))
-        	$label .= '<br><b>' . $langs->trans('Date') . ':</b> ' . dol_print_date($this->date, 'day');
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-        if ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
-        elseif ($this->type == self::TYPE_CREDIT_NOTE) $label=$langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
-        elseif ($this->type == self::TYPE_DEPOSIT)     $label=$langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
-        if ($moretitle) $label.=' - '.$moretitle;
+        $label = '<u>'.$langs->trans("ShowSupplierInvoice").'</u>';
+        if (!empty($this->ref))
+            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+        if (!empty($this->ref_supplier))
+            $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+        if (!empty($this->label))
+        	$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+        if (!empty($this->date))
+        	$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
+        if (!empty($this->total_ht))
+            $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_tva))
+            $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_ttc))
+            $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        if ($this->type == self::TYPE_REPLACEMENT) $label = $langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
+        elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = $langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
+        elseif ($this->type == self::TYPE_DEPOSIT)     $label = $langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
+        if ($moretitle) $label .= ' - '.$moretitle;
 
-        $ref=$this->ref;
-        if (empty($ref)) $ref=$this->id;
+        $ref = $this->ref;
+        if (empty($ref)) $ref = $this->id;
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowSupplierInvoice");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowSupplierInvoice");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip"';
         }
 
         $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
         $result .= $linkstart;
-        if ($withpicto) $result.=img_object(($notooltip?'':$label), $picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-        if ($withpicto != 2) $result.= ($max?dol_trunc($ref, $max):$ref);
+        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+        if ($withpicto != 2) $result .= ($max ?dol_trunc($ref, $max) : $ref);
         $result .= $linkend;
 
         if ($addlinktonotes)
@@ -2384,7 +2384,7 @@ class FactureFournisseur extends CommonInvoice
         }
         else
         {
-            $this->error=$obj->error;
+            $this->error = $obj->error;
             //dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
             return false;
         }
@@ -2505,27 +2505,27 @@ class FactureFournisseur extends CommonInvoice
         // phpcs:enable
 		global $conf, $user;
 
-		$this->nb=array();
+		$this->nb = array();
 
 		$clause = "WHERE";
 
 		$sql = "SELECT count(f.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
 		if (!$user->rights->societe->client->voir && !$user->socid)
 		{
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-			$sql.= " WHERE sc.fk_user = " .$user->id;
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
 		}
-		$sql.= " ".$clause." f.entity = ".$conf->entity;
+		$sql .= " ".$clause." f.entity = ".$conf->entity;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj=$this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$this->nb["supplier_invoices"]=$obj->nb;
+				$this->nb["supplier_invoices"] = $obj->nb;
 			}
             $this->db->free($resql);
 			return 1;
@@ -2550,16 +2550,16 @@ class FactureFournisseur extends CommonInvoice
     {
         global $langs;
 
-        $error=0;
+        $error = 0;
 
-        $object=new FactureFournisseur($this->db);
+        $object = new FactureFournisseur($this->db);
 
 		$this->db->begin();
 
         // Load source object
         $object->fetch($fromid);
-        $object->id=0;
-        $object->statut=self::STATUS_DRAFT;
+        $object->id = 0;
+        $object->statut = self::STATUS_DRAFT;
 
         // Clear fields
         $object->ref_supplier       = (empty($this->ref_supplier) ? $langs->trans("CopyOf").' '.$object->ref_supplier : $this->ref_supplier);
@@ -2714,9 +2714,9 @@ class FactureFournisseur extends CommonInvoice
 
         $sql = "SELECT fk_invoice_supplier FROM ".MAIN_DB_PREFIX."societe_remise_except WHERE fk_invoice_supplier_source=".$this->id;
         $resql = $db->query($sql);
-        if(!empty($resql)){
+        if (!empty($resql)) {
             $obj = $db->fetch_object($resql);
-            if(!empty($obj->fk_invoice_supplier))$isUsed=true;
+            if (!empty($obj->fk_invoice_supplier))$isUsed = true;
         }
 
         return $isUsed;
@@ -2968,14 +2968,14 @@ class SupplierInvoiceLine extends CommonObjectLine
 	public function fetch($rowid)
 	{
 		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx';
-		$sql.= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
-		$sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_facture_fourn, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
-		$sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc';
-		$sql.= ', f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, multicurrency_total_ttc';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
-		$sql.= ' WHERE f.rowid = '.$rowid;
-		$sql.= ' ORDER BY f.rang, f.rowid';
+		$sql .= ', f.localtax1_type, f.localtax2_type, f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
+		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_facture_fourn, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
+		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc';
+		$sql .= ', f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, multicurrency_total_ttc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
+		$sql .= ' WHERE f.rowid = '.$rowid;
+		$sql .= ' ORDER BY f.rang, f.rowid';
 
 		$query = $this->db->query($sql);
 
@@ -3010,21 +3010,21 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->localtax1_type		= $obj->localtax1_type;
 		$this->localtax2_type		= $obj->localtax2_type;
 		$this->qty				= $obj->qty;
-		$this->remise_percent    = $obj->remise_percent;
-		$this->tva				= $obj->total_tva;			// deprecated
-		$this->total_ht			= $obj->total_ht;
+		$this->remise_percent = $obj->remise_percent;
+		$this->tva				= $obj->total_tva; // deprecated
+		$this->total_ht = $obj->total_ht;
 		$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->fk_product		= $obj->fk_product;
-		$this->product_type		= $obj->product_type;
+		$this->product_type = $obj->product_type;
 		$this->product_label		= $obj->product_label;
 		$this->info_bits		    = $obj->info_bits;
-		$this->tva_npr              = ($obj->info_bits & 1 == 1) ? 1 : 0;
+		$this->tva_npr = ($obj->info_bits & 1 == 1) ? 1 : 0;
 		$this->fk_parent_line    = $obj->fk_parent_line;
-		$this->special_code		= $obj->special_code;
-		$this->rang       		= $obj->rang;
+		$this->special_code = $obj->special_code;
+		$this->rang = $obj->rang;
 		$this->fk_unit           = $obj->fk_unit;
 
 		$this->multicurrency_subprice = $obj->multicurrency_subprice;
@@ -3209,50 +3209,50 @@ class SupplierInvoiceLine extends CommonObjectLine
      */
     public function insert($notrigger = 0)
     {
-        global $user,$conf;
+        global $user, $conf;
 
-        $error=0;
+        $error = 0;
 
         dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
 
         // Clean parameters
-        $this->desc=trim($this->desc);
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type='0';
-        if (empty($this->localtax2_type)) $this->localtax2_type='0';
-        if (empty($this->total_tva)) $this->total_tva=0;
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->subprice)) $this->subprice=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (! isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
+        $this->desc = trim($this->desc);
+        if (empty($this->tva_tx)) $this->tva_tx = 0;
+        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+        if (empty($this->localtax1_type)) $this->localtax1_type = '0';
+        if (empty($this->localtax2_type)) $this->localtax2_type = '0';
+        if (empty($this->total_tva)) $this->total_tva = 0;
+        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+        if (empty($this->rang)) $this->rang = 0;
+        if (empty($this->remise_percent)) $this->remise_percent = 0;
+        if (empty($this->info_bits)) $this->info_bits = 0;
+        if (empty($this->subprice)) $this->subprice = 0;
+        if (empty($this->special_code)) $this->special_code = 0;
+        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+        if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
 
-        if (empty($this->pa_ht)) $this->pa_ht=0;
-        if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice=0;
-        if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht=0;
-        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva=0;
-        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc=0;
+        if (empty($this->pa_ht)) $this->pa_ht = 0;
+        if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
+        if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
+        if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
+        if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
 
 
         // Check parameters
         if ($this->product_type < 0)
         {
-            $this->error='ErrorProductTypeMustBe0orMore';
+            $this->error = 'ErrorProductTypeMustBe0orMore';
             return -1;
         }
-        if (! empty($this->fk_product))
+        if (!empty($this->fk_product))
         {
             // Check product exists
-            $result=Product::isExistingObject('product', $this->fk_product);
+            $result = Product::isExistingObject('product', $this->fk_product);
             if ($result <= 0)
             {
-                $this->error='ErrorProductIdDoesNotExists';
+                $this->error = 'ErrorProductIdDoesNotExists';
                 return -1;
             }
         }
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 9cc287cd28a..bf78cfeafc9 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -40,23 +40,23 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Get parameters
-$action=GETPOST('action', 'aZ09');
-$cancel=GETPOST('cancel', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
-$id=GETPOST('id', 'int');
-$ref=GETPOST('ref', 'alpha');
-$fuserid = (GETPOST('fuserid', 'int')?GETPOST('fuserid', 'int'):$user->id);
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$fuserid = (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id);
 
 // Load translation files required by the page
-$langs->loadLangs(array("holiday","mails"));
+$langs->loadLangs(array("holiday", "mails"));
 
-$now=dol_now();
+$now = dol_now();
 
 $childids = $user->getAllChildIds(1);
 
 $morefilter = 'AND employee = 1';
-if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
+if (!empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
 
 $error = 0;
 
@@ -90,7 +90,7 @@ if (!empty($user->rights->holiday->delete)) $candelete = 1;
 if ($object->statut == Holiday::STATUS_DRAFT && $user->rights->holiday->write && in_array($object->fk_user, $childids)) $candelete = 1;
 
 // Protection if external user
-if ($user->socid) $socid=$user->socid;
+if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'holiday', $object->id, 'holiday');
 
 
@@ -1287,8 +1287,8 @@ else
                 $htmlhelp = $langs->trans('NbUseDaysCPHelp');
                 $includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
                 $includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
-                if ($includesaturday) $htmlhelp.='<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Saturday"));
-                if ($includesunday) $htmlhelp.='<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Sunday"));
+                if ($includesaturday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Saturday"));
+                if ($includesunday) $htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Sunday"));
                 print $form->textwithpicto($langs->trans('NbUseDaysCP'), $htmlhelp);
                 print '</td>';
                 print '<td>'.num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday).'</td>';
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index f925b645b98..5b4900bd154 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -186,7 +186,7 @@ if ($resql)
 	print '<td class="liste_titre"></td>';
 	print '<td class="right liste_titre">';
 	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto=$form->showFilterAndCheckAddButtons(0);
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
 	print $searchpicto;
 	print '</td>';
 
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index bf9a97d4a7d..74354539043 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -81,14 +81,14 @@ else
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
 {
-	$search_ref="";
-	$search_user="";
-	$search_label="";
-	$search_date_start='';
-	$search_date_end='';
-	$search_amount="";
-	$search_account='';
-    $typeid="";
+	$search_ref = "";
+	$search_user = "";
+	$search_label = "";
+	$search_date_start = '';
+	$search_date_end = '';
+	$search_amount = "";
+	$search_account = '';
+    $typeid = "";
 }
 
 
@@ -119,8 +119,8 @@ $sql .= " AND s.entity = ".$conf->entity;
 if ($search_ref)			$sql .= " AND s.rowid=".$search_ref;
 if ($search_user)			$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user);
 if ($search_label)			$sql .= natural_search(array('s.label'), $search_label);
-if ($search_date_start)     $sql .= " AND s.datep >= '" . $db->idate($search_date_start) . "'";
-if ($search_date_end)		$sql .= " AND s.datep <= '" . $db->idate($search_date_end) . "'";
+if ($search_date_start)     $sql .= " AND s.datep >= '".$db->idate($search_date_start)."'";
+if ($search_date_end)		$sql .= " AND s.datep <= '".$db->idate($search_date_end)."'";
 if ($search_amount)			$sql .= natural_search("s.amount", $search_amount, 1);
 if ($search_account > 0)	$sql .= " AND b.fk_account=".$search_account;
 if ($filtre) {
@@ -188,12 +188,12 @@ if ($result)
 	// Date
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From') . ' ';
-	print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1);
+	print $langs->trans('From').' ';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to') . ' ';
-	print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1);
+	print $langs->trans('to').' ';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
 	print '</div>';
 	print '</td>';
 	// Type
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index b01b7181f75..8848df02e80 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -34,12 +34,12 @@
  *	\brief      File of class to manage supplier proposals
  */
 
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php';
-require_once DOL_DOCUMENT_ROOT .'/multicurrency/class/multicurrency.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
  *	Class to manage price ask supplier
@@ -49,27 +49,27 @@ class SupplierProposal extends CommonObject
     /**
      * @var string ID to identify managed object
      */
-    public $element='supplier_proposal';
+    public $element = 'supplier_proposal';
 
     /**
      * @var string Name of table without prefix where object is stored
      */
-    public $table_element='supplier_proposal';
+    public $table_element = 'supplier_proposal';
 
     /**
      * @var int    Name of subtable line
      */
-    public $table_element_line='supplier_proposaldet';
+    public $table_element_line = 'supplier_proposaldet';
 
     /**
      * @var int Field with ID of parent key if this field has a parent
      */
-    public $fk_element='fk_supplier_proposal';
+    public $fk_element = 'fk_supplier_proposal';
 
     /**
      * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
      */
-    public $picto='propal';
+    public $picto = 'propal';
 
     /**
      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -88,7 +88,7 @@ class SupplierProposal extends CommonObject
      */
     protected $table_ref_field = 'ref';
 
-    public $socid;		// Id client
+    public $socid; // Id client
 
     /**
      * @deprecated
@@ -96,9 +96,9 @@ class SupplierProposal extends CommonObject
      */
     public $author;
 
-    public $ref_fourn;					//Reference saisie lors de l'ajout d'une ligne à la demande
-    public $ref_supplier;				//Reference saisie lors de l'ajout d'une ligne à la demande
-    public $statut;					// 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
+    public $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande
+    public $ref_supplier; //Reference saisie lors de l'ajout d'une ligne à la demande
+    public $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
 
     /**
      * @var integer|string Date of proposal
@@ -161,14 +161,14 @@ class SupplierProposal extends CommonObject
     public $remise_percent = 0;
     public $remise_absolue = 0;
 
-    public $products=array();
-    public $extraparams=array();
+    public $products = array();
+    public $extraparams = array();
 
     public $lines = array();
     public $line;
 
-    public $labelStatus=array();
-    public $labelStatusShort=array();
+    public $labelStatus = array();
+    public $labelStatusShort = array();
 
     public $nbtodo;
     public $nbtodolate;
@@ -223,7 +223,7 @@ class SupplierProposal extends CommonObject
      */
     public function __construct($db, $socid = "", $supplier_proposalid = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
         $this->db = $db;
 
@@ -252,24 +252,24 @@ class SupplierProposal extends CommonObject
         // phpcs:enable
         global $conf, $mysoc;
 
-        if (! $qty) $qty = 1;
+        if (!$qty) $qty = 1;
 
         dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
         if ($idproduct > 0)
         {
-            $prod=new Product($this->db);
+            $prod = new Product($this->db);
             $prod->fetch($idproduct);
 
             $productdesc = $prod->description;
 
             $tva_tx = get_default_tva($mysoc, $this->thirdparty, $prod->id);
             $tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
-            if (empty($tva_tx)) $tva_npr=0;
+            if (empty($tva_tx)) $tva_npr = 0;
             $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
             $localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $this->thirdparty, $tva_npr);
 
             // multiprix
-            if($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
+            if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
             {
                 $price = $prod->multiprices[$this->thirdparty->price_level];
             }
@@ -280,14 +280,14 @@ class SupplierProposal extends CommonObject
 
             $line = new SupplierProposalLine($this->db);
 
-            $line->fk_product=$idproduct;
-            $line->desc=$productdesc;
-            $line->qty=$qty;
-            $line->subprice=$price;
-            $line->remise_percent=$remise_percent;
-            $line->tva_tx=$tva_tx;
+            $line->fk_product = $idproduct;
+            $line->desc = $productdesc;
+            $line->qty = $qty;
+            $line->subprice = $price;
+            $line->remise_percent = $remise_percent;
+            $line->tva_tx = $tva_tx;
 
-            $this->lines[]=$line;
+            $this->lines[] = $line;
         }
     }
 
@@ -308,39 +308,39 @@ class SupplierProposal extends CommonObject
 
         $this->db->begin();
 
-        $remise=new DiscountAbsolute($this->db);
-        $result=$remise->fetch($idremise);
+        $remise = new DiscountAbsolute($this->db);
+        $result = $remise->fetch($idremise);
 
         if ($result > 0)
         {
             if ($remise->fk_facture)	// Protection against multiple submission
             {
-                $this->error=$langs->trans("ErrorDiscountAlreadyUsed");
+                $this->error = $langs->trans("ErrorDiscountAlreadyUsed");
                 $this->db->rollback();
                 return -5;
             }
 
-            $supplier_proposalligne=new SupplierProposalLine($this->db);
-            $supplier_proposalligne->fk_supplier_proposal=$this->id;
-            $supplier_proposalligne->fk_remise_except=$remise->id;
-            $supplier_proposalligne->desc=$remise->description;   	// Description ligne
-            $supplier_proposalligne->tva_tx=$remise->tva_tx;
-            $supplier_proposalligne->subprice=-$remise->amount_ht;
-            $supplier_proposalligne->fk_product=0;					// Id produit predefini
-            $supplier_proposalligne->qty=1;
-            $supplier_proposalligne->remise=0;
-            $supplier_proposalligne->remise_percent=0;
-            $supplier_proposalligne->rang=-1;
-            $supplier_proposalligne->info_bits=2;
+            $supplier_proposalligne = new SupplierProposalLine($this->db);
+            $supplier_proposalligne->fk_supplier_proposal = $this->id;
+            $supplier_proposalligne->fk_remise_except = $remise->id;
+            $supplier_proposalligne->desc = $remise->description; // Description ligne
+            $supplier_proposalligne->tva_tx = $remise->tva_tx;
+            $supplier_proposalligne->subprice = -$remise->amount_ht;
+            $supplier_proposalligne->fk_product = 0; // Id produit predefini
+            $supplier_proposalligne->qty = 1;
+            $supplier_proposalligne->remise = 0;
+            $supplier_proposalligne->remise_percent = 0;
+            $supplier_proposalligne->rang = -1;
+            $supplier_proposalligne->info_bits = 2;
 
             $supplier_proposalligne->total_ht  = -$remise->amount_ht;
             $supplier_proposalligne->total_tva = -$remise->amount_tva;
             $supplier_proposalligne->total_ttc = -$remise->amount_ttc;
 
-            $result=$supplier_proposalligne->insert();
+            $result = $supplier_proposalligne->insert();
             if ($result > 0)
             {
-                $result=$this->update_price(1);
+                $result = $this->update_price(1);
                 if ($result > 0)
                 {
                     $this->db->commit();
@@ -354,7 +354,7 @@ class SupplierProposal extends CommonObject
             }
             else
             {
-                $this->error=$supplier_proposalligne->error;
+                $this->error = $supplier_proposalligne->error;
                 $this->db->rollback();
                 return -2;
             }
@@ -411,28 +411,28 @@ class SupplierProposal extends CommonObject
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
-        if (empty($remise_percent)) $remise_percent=0;
-        if (empty($qty)) $qty=0;
-        if (empty($info_bits)) $info_bits=0;
-        if (empty($rang)) $rang=0;
-        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
-        if (empty($pu_ht)) $pu_ht=0;
+        if (empty($remise_percent)) $remise_percent = 0;
+        if (empty($qty)) $qty = 0;
+        if (empty($info_bits)) $info_bits = 0;
+        if (empty($rang)) $rang = 0;
+        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
+        if (empty($pu_ht)) $pu_ht = 0;
 
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
-        $pu_ht=price2num($pu_ht);
-        $pu_ttc=price2num($pu_ttc);
-        $txtva=price2num($txtva);
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-            $pa_ht=price2num($pa_ht);
-        if ($price_base_type=='HT')
+        $remise_percent = price2num($remise_percent);
+        $qty = price2num($qty);
+        $pu_ht = price2num($pu_ht);
+        $pu_ttc = price2num($pu_ttc);
+        $txtva = price2num($txtva);
+        $txlocaltax1 = price2num($txlocaltax1);
+        $txlocaltax2 = price2num($txlocaltax2);
+            $pa_ht = price2num($pa_ht);
+        if ($price_base_type == 'HT')
         {
-            $pu=$pu_ht;
+            $pu = $pu_ht;
         }
         else
         {
-            $pu=$pu_ttc;
+            $pu = $pu_ttc;
         }
 
         // Check parameters
@@ -444,7 +444,7 @@ class SupplierProposal extends CommonObject
 
             if ($fk_product > 0)
             {
-                if (! empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
+                if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
                 {
                     // Check quantity is enough
                     dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_fournprice=".$fk_fournprice." qty=".$qty." ref_supplier=".$ref_supplier);
@@ -457,19 +457,19 @@ class SupplierProposal extends CommonObject
 
                         // We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
                         // If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
-                        $result=$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc?$this->fk_soc:$this->socid));   // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+                        $result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
                         if ($result > 0)
                         {
-                            $pu = $prod->fourn_pu;       // Unit price supplier price set by get_buyprice
-                            $ref_supplier = $prod->ref_supplier;   // Ref supplier price set by get_buyprice
+                            $pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+                            $ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
                             // is remise percent not keyed but present for the product we add it
-                            if ($remise_percent == 0 && $prod->remise_percent !=0)
-                                $remise_percent =$prod->remise_percent;
+                            if ($remise_percent == 0 && $prod->remise_percent != 0)
+                                $remise_percent = $prod->remise_percent;
                         }
                         if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
                         {
                             $langs->load("errors");
-                            $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+                            $this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
                             $this->db->rollback();
                             dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
                             //$pu    = $prod->fourn_pu;     // We do not overwrite unit price
@@ -479,14 +479,14 @@ class SupplierProposal extends CommonObject
                         if ($result == -1)
                         {
                             $langs->load("errors");
-                            $this->error = "Ref " . $prod->ref . " " . $langs->trans("ErrorQtyTooLowForThisSupplier");
+                            $this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
                             $this->db->rollback();
                             dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
                             return -1;
                         }
                         if ($result < -1)
                         {
-                            $this->error=$prod->error;
+                            $this->error = $prod->error;
                             $this->db->rollback();
                             dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
                             return -1;
@@ -494,7 +494,7 @@ class SupplierProposal extends CommonObject
                     }
                     else
                     {
-                        $this->error=$prod->error;
+                        $this->error = $prod->error;
                         $this->db->rollback();
                         return -1;
                     }
@@ -510,14 +510,14 @@ class SupplierProposal extends CommonObject
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
-            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);  // Remove code into vatrate.
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 
             if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
                 $pu = 0;
             }
 
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
@@ -550,33 +550,33 @@ class SupplierProposal extends CommonObject
             }
 
             // Insert line
-            $this->line=new SupplierProposalLine($this->db);
+            $this->line = new SupplierProposalLine($this->db);
 
-            $this->line->fk_supplier_proposal=$this->id;
-            $this->line->label=$label;
-            $this->line->desc=$desc;
-            $this->line->qty=$qty;
-            $this->line->tva_tx=$txtva;
-            $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0);
-            $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0);
+            $this->line->fk_supplier_proposal = $this->id;
+            $this->line->label = $label;
+            $this->line->desc = $desc;
+            $this->line->qty = $qty;
+            $this->line->tva_tx = $txtva;
+            $this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
+            $this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
             $this->line->localtax1_type = $localtaxes_type[0];
             $this->line->localtax2_type = $localtaxes_type[2];
-            $this->line->fk_product=$fk_product;
-            $this->line->remise_percent=$remise_percent;
-            $this->line->subprice=$pu_ht;
-            $this->line->rang=$ranktouse;
-            $this->line->info_bits=$info_bits;
-            $this->line->total_ht=$total_ht;
-            $this->line->total_tva=$total_tva;
-            $this->line->total_localtax1=$total_localtax1;
-            $this->line->total_localtax2=$total_localtax2;
-            $this->line->total_ttc=$total_ttc;
-            $this->line->product_type=$type;
-            $this->line->special_code=$special_code;
-            $this->line->fk_parent_line=$fk_parent_line;
-            $this->line->fk_unit=$fk_unit;
-            $this->line->origin=$origin;
-            $this->line->origin_id=$origin_id;
+            $this->line->fk_product = $fk_product;
+            $this->line->remise_percent = $remise_percent;
+            $this->line->subprice = $pu_ht;
+            $this->line->rang = $ranktouse;
+            $this->line->info_bits = $info_bits;
+            $this->line->total_ht = $total_ht;
+            $this->line->total_tva = $total_tva;
+            $this->line->total_localtax1 = $total_localtax1;
+            $this->line->total_localtax2 = $total_localtax2;
+            $this->line->total_ttc = $total_ttc;
+            $this->line->product_type = $type;
+            $this->line->special_code = $special_code;
+            $this->line->fk_parent_line = $fk_parent_line;
+            $this->line->fk_unit = $fk_unit;
+            $this->line->origin = $origin;
+            $this->line->origin_id = $origin_id;
             $this->line->ref_fourn = $this->db->escape($ref_supplier);
 			$this->line->date_start = $date_start;
 			$this->line->date_end = $date_end;
@@ -594,28 +594,28 @@ class SupplierProposal extends CommonObject
             $this->line->pa_ht = $pa_ht;
 
             // Multicurrency
-            $this->line->fk_multicurrency			= $this->fk_multicurrency;
-            $this->line->multicurrency_code			= $this->multicurrency_code;
+            $this->line->fk_multicurrency = $this->fk_multicurrency;
+            $this->line->multicurrency_code = $this->multicurrency_code;
             $this->line->multicurrency_subprice		= $pu_ht_devise;
             $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
             // Mise en option de la ligne
-            if (empty($qty) && empty($special_code)) $this->line->special_code=3;
+            if (empty($qty) && empty($special_code)) $this->line->special_code = 3;
 
-            if (is_array($array_option) && count($array_option)>0) {
-                $this->line->array_options=$array_option;
+            if (is_array($array_option) && count($array_option) > 0) {
+                $this->line->array_options = $array_option;
             }
 
-            $result=$this->line->insert();
+            $result = $this->line->insert();
             if ($result > 0)
             {
                 // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true, 'DESC');
+                if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
                 // Mise a jour informations denormalisees au niveau de la propale meme
-                $result=$this->update_price(1, 'auto', 0, $this->thirdparty);	// This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+                $result = $this->update_price(1, 'auto', 0, $this->thirdparty); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
                 if ($result > 0)
                 {
                     $this->db->commit();
@@ -623,14 +623,14 @@ class SupplierProposal extends CommonObject
                 }
                 else
                 {
-                    $this->error=$this->db->error();
+                    $this->error = $this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
             }
             else
             {
-                $this->error=$this->line->error;
+                $this->error = $this->line->error;
                 $this->db->rollback();
                 return -2;
             }
@@ -671,21 +671,21 @@ class SupplierProposal extends CommonObject
      */
     public function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $desc = '', $price_base_type = 'HT', $info_bits = 0, $special_code = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $type = 0, $array_option = 0, $ref_supplier = '', $fk_unit = '', $pu_ht_devise = 0)
     {
-        global $conf,$user,$langs, $mysoc;
+        global $conf, $user, $langs, $mysoc;
 
         dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
-        $remise_percent=price2num($remise_percent);
-        $qty=price2num($qty);
+        $remise_percent = price2num($remise_percent);
+        $qty = price2num($qty);
         $pu = price2num($pu);
         $txtva = price2num($txtva);
-        $txlocaltax1=price2num($txlocaltax1);
-        $txlocaltax2=price2num($txlocaltax2);
-        $pa_ht=price2num($pa_ht);
-        if (empty($qty) && empty($special_code)) $special_code=3;    // Set option tag
-        if (! empty($qty) && $special_code == 3) $special_code=0;    // Remove option tag
+        $txlocaltax1 = price2num($txlocaltax1);
+        $txlocaltax2 = price2num($txlocaltax2);
+        $pa_ht = price2num($pa_ht);
+        if (empty($qty) && empty($special_code)) $special_code = 3; // Set option tag
+        if (!empty($qty) && $special_code == 3) $special_code = 0; // Remove option tag
 
         if ($this->statut == 0)
         {
@@ -696,18 +696,18 @@ class SupplierProposal extends CommonObject
             // TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
             // la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
 
-            $localtaxes_type=getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
+            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
             // Clean vat code
             $reg = array();
-            $vat_src_code='';
+            $vat_src_code = '';
             if (preg_match('/\((.*)\)/', $txtva, $reg))
             {
             	$vat_src_code = $reg[1];
-            	$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+            	$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
             }
 
-            $tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
             $total_ht  = $tabprice[0];
             $total_tva = $tabprice[1];
             $total_ttc = $tabprice[2];
@@ -720,28 +720,28 @@ class SupplierProposal extends CommonObject
             $multicurrency_total_ttc = $tabprice[18];
 
             // Update line
-            $this->line=new SupplierProposalLine($this->db);
+            $this->line = new SupplierProposalLine($this->db);
 
             // Stock previous line records
-            $staticline=new SupplierProposalLine($this->db);
+            $staticline = new SupplierProposalLine($this->db);
             $staticline->fetch($rowid);
             $this->line->oldline = $staticline;
 
             // Reorder if fk_parent_line change
-            if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
+            if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
             {
                 $rangmax = $this->line_max($fk_parent_line);
                 $this->line->rang = $rangmax + 1;
             }
 
             $this->line->id					= $rowid;
-            $this->line->label				= $label;
-            $this->line->desc				= $desc;
+            $this->line->label = $label;
+            $this->line->desc = $desc;
             $this->line->qty				= $qty;
-            $this->line->product_type		= $type;
+            $this->line->product_type = $type;
 
-            $this->line->vat_src_code       = $vat_src_code;
-            $this->line->tva_tx				= $txtva;
+            $this->line->vat_src_code = $vat_src_code;
+            $this->line->tva_tx = $txtva;
             $this->line->localtax1_tx		= $txlocaltax1;
             $this->line->localtax2_tx		= $txlocaltax2;
             $this->line->localtax1_type		= $localtaxes_type[0];
@@ -754,11 +754,11 @@ class SupplierProposal extends CommonObject
             $this->line->total_localtax1	= $total_localtax1;
             $this->line->total_localtax2	= $total_localtax2;
             $this->line->total_ttc			= $total_ttc;
-            $this->line->special_code		= $special_code;
+            $this->line->special_code = $special_code;
             $this->line->fk_parent_line		= $fk_parent_line;
-            $this->line->skip_update_total	= $skip_update_total;
-            $this->line->ref_fourn			= $ref_supplier;
-            $this->line->fk_unit			= $fk_unit;
+            $this->line->skip_update_total = $skip_update_total;
+            $this->line->ref_fourn = $ref_supplier;
+            $this->line->fk_unit = $fk_unit;
 
             // infos marge
             if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
@@ -772,8 +772,8 @@ class SupplierProposal extends CommonObject
             }
             $this->line->pa_ht = $pa_ht;
 
-            if (is_array($array_option) && count($array_option)>0) {
-                $this->line->array_options=$array_option;
+            if (is_array($array_option) && count($array_option) > 0) {
+                $this->line->array_options = $array_option;
             }
 
             // Multicurrency
@@ -782,11 +782,11 @@ class SupplierProposal extends CommonObject
             $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
             $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-            $result=$this->line->update();
+            $result = $this->line->update();
             if ($result > 0)
             {
                 // Reorder if child line
-                if (! empty($fk_parent_line)) $this->line_order(true, 'DESC');
+                if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
                 $this->update_price(1);
 
@@ -797,7 +797,7 @@ class SupplierProposal extends CommonObject
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 $this->db->rollback();
                 return -1;
             }
@@ -820,7 +820,7 @@ class SupplierProposal extends CommonObject
     {
         if ($this->statut == 0)
         {
-            $line=new SupplierProposalLine($this->db);
+            $line = new SupplierProposalLine($this->db);
 
             // For triggers
             $line->fetch($lineid);
@@ -854,28 +854,28 @@ class SupplierProposal extends CommonObject
     public function create($user, $notrigger = 0)
     {
         global $langs, $conf, $mysoc, $hookmanager;
-        $error=0;
+        $error = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
         dol_syslog(get_class($this)."::create");
 
         // Check parameters
-        $result=$this->fetch_thirdparty();
+        $result = $this->fetch_thirdparty();
         if ($result < 0)
         {
-            $this->error="Failed to fetch company";
+            $this->error = "Failed to fetch company";
             dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -3;
         }
 
         // Check parameters
-        if (! empty($this->ref))	// We check that ref is not already used
+        if (!empty($this->ref))	// We check that ref is not already used
         {
-            $result=self::isExistingObject($this->element, 0, $this->ref);	// Check ref is not yet used
+            $result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
             if ($result > 0)
             {
-                $this->error='ErrorRefAlreadyExists';
+                $this->error = 'ErrorRefAlreadyExists';
                 dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
                 $this->db->rollback();
                 return -1;
@@ -883,7 +883,7 @@ class SupplierProposal extends CommonObject
         }
 
         // Multicurrency
-        if (!empty($this->multicurrency_code)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+        if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
         if (empty($this->fk_multicurrency))
         {
             $this->multicurrency_code = $conf->currency;
@@ -895,87 +895,87 @@ class SupplierProposal extends CommonObject
 
         // Insert into database
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."supplier_proposal (";
-        $sql.= "fk_soc";
-        $sql.= ", price";
-        $sql.= ", remise";
-        $sql.= ", remise_percent";
-        $sql.= ", remise_absolue";
-        $sql.= ", tva";
-        $sql.= ", total";
-        $sql.= ", datec";
-        $sql.= ", ref";
-        $sql.= ", fk_user_author";
-        $sql.= ", note_private";
-        $sql.= ", note_public";
-        $sql.= ", model_pdf";
-        $sql.= ", fk_cond_reglement";
-        $sql.= ", fk_mode_reglement";
-        $sql.= ", fk_account";
-        $sql.= ", date_livraison";
-        $sql.= ", fk_shipping_method";
-        $sql.= ", fk_projet";
-        $sql.= ", entity";
-        $sql.= ", fk_multicurrency";
-        $sql.= ", multicurrency_code";
-        $sql.= ", multicurrency_tx";
-        $sql.= ") ";
-        $sql.= " VALUES (";
-        $sql.= $this->socid;
-        $sql.= ", 0";
-        $sql.= ", ".$this->remise;
-        $sql.= ", ".($this->remise_percent?$this->db->escape($this->remise_percent):'null');
-        $sql.= ", ".($this->remise_absolue?$this->db->escape($this->remise_absolue):'null');
-        $sql.= ", 0";
-        $sql.= ", 0";
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ", '(PROV)'";
-        $sql.= ", ".($user->id > 0 ? "'".$user->id."'":"null");
-        $sql.= ", '".$this->db->escape($this->note_private)."'";
-        $sql.= ", '".$this->db->escape($this->note_public)."'";
-        $sql.= ", '".$this->db->escape($this->modelpdf)."'";
-        $sql.= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
-        $sql.= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
-        $sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
-        $sql.= ", ".($this->date_livraison!=''?"'".$this->db->idate($this->date_livraison)."'":"null");
-        $sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:'NULL');
-        $sql.= ", ".($this->fk_project?$this->fk_project:"null");
-        $sql.= ", ".$conf->entity;
-        $sql.= ", ".(int) $this->fk_multicurrency;
-        $sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql.= ", ".(double) $this->multicurrency_tx;
-        $sql.= ")";
+        $sql .= "fk_soc";
+        $sql .= ", price";
+        $sql .= ", remise";
+        $sql .= ", remise_percent";
+        $sql .= ", remise_absolue";
+        $sql .= ", tva";
+        $sql .= ", total";
+        $sql .= ", datec";
+        $sql .= ", ref";
+        $sql .= ", fk_user_author";
+        $sql .= ", note_private";
+        $sql .= ", note_public";
+        $sql .= ", model_pdf";
+        $sql .= ", fk_cond_reglement";
+        $sql .= ", fk_mode_reglement";
+        $sql .= ", fk_account";
+        $sql .= ", date_livraison";
+        $sql .= ", fk_shipping_method";
+        $sql .= ", fk_projet";
+        $sql .= ", entity";
+        $sql .= ", fk_multicurrency";
+        $sql .= ", multicurrency_code";
+        $sql .= ", multicurrency_tx";
+        $sql .= ") ";
+        $sql .= " VALUES (";
+        $sql .= $this->socid;
+        $sql .= ", 0";
+        $sql .= ", ".$this->remise;
+        $sql .= ", ".($this->remise_percent ? $this->db->escape($this->remise_percent) : 'null');
+        $sql .= ", ".($this->remise_absolue ? $this->db->escape($this->remise_absolue) : 'null');
+        $sql .= ", 0";
+        $sql .= ", 0";
+        $sql .= ", '".$this->db->idate($now)."'";
+        $sql .= ", '(PROV)'";
+        $sql .= ", ".($user->id > 0 ? "'".$user->id."'" : "null");
+        $sql .= ", '".$this->db->escape($this->note_private)."'";
+        $sql .= ", '".$this->db->escape($this->note_public)."'";
+        $sql .= ", '".$this->db->escape($this->modelpdf)."'";
+        $sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
+        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
+        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+        $sql .= ", ".($this->date_livraison != '' ? "'".$this->db->idate($this->date_livraison)."'" : "null");
+        $sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
+        $sql .= ", ".($this->fk_project ? $this->fk_project : "null");
+        $sql .= ", ".$conf->entity;
+        $sql .= ", ".(int) $this->fk_multicurrency;
+        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+        $sql .= ", ".(double) $this->multicurrency_tx;
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."supplier_proposal");
 
             if ($this->id)
             {
-                $this->ref='(PROV'.$this->id.')';
+                $this->ref = '(PROV'.$this->id.')';
                 $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
                 dol_syslog(get_class($this)."::create", LOG_DEBUG);
-                $resql=$this->db->query($sql);
-                if (! $resql) $error++;
+                $resql = $this->db->query($sql);
+                if (!$resql) $error++;
 
-                if (! empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+                if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
                 {
-                    $this->linked_objects = $this->linkedObjectsIds;	// TODO Replace linked_objects with linkedObjectsIds
+                    $this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
                 }
 
                 // Add object linked
-                if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+                if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
                 {
-                    foreach($this->linked_objects as $origin => $tmp_origin_id)
+                    foreach ($this->linked_objects as $origin => $tmp_origin_id)
                     {
                         if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
                         {
-                            foreach($tmp_origin_id as $origin_id)
+                            foreach ($tmp_origin_id as $origin_id)
                             {
                                 $ret = $this->add_object_linked($origin, $origin_id);
-                                if (! $ret)
+                                if (!$ret)
                                 {
                                     dol_print_error($this->db);
                                     $error++;
@@ -988,12 +988,12 @@ class SupplierProposal extends CommonObject
                 /*
                  *  Insertion du detail des produits dans la base
                  */
-                if (! $error)
+                if (!$error)
                 {
-                    $fk_parent_line=0;
-                    $num=count($this->lines);
+                    $fk_parent_line = 0;
+                    $num = count($this->lines);
 
-                    for ($i=0;$i<$num;$i++)
+                    for ($i = 0; $i < $num; $i++)
                     {
                         // Reset fk_parent_line for no child products and special product
                         if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
@@ -1029,7 +1029,7 @@ class SupplierProposal extends CommonObject
                         if ($result < 0)
                         {
                             $error++;
-                            $this->error=$this->db->error;
+                            $this->error = $this->db->error;
                             dol_print_error($this->db);
                             break;
                         }
@@ -1040,46 +1040,46 @@ class SupplierProposal extends CommonObject
                     }
                 }
 
-                if (! $error)
+                if (!$error)
                 {
                     // Mise a jour infos denormalisees
-                    $resql=$this->update_price(1);
+                    $resql = $this->update_price(1);
                     if ($resql)
                     {
-                        $action='update';
+                        $action = 'update';
 
                         // Actions on extra fields
-                        if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+                        if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
                         {
-                            $result=$this->insertExtraFields();
+                            $result = $this->insertExtraFields();
                             if ($result < 0)
                             {
                                 $error++;
                             }
                         }
 
-                        if (! $error && ! $notrigger)
+                        if (!$error && !$notrigger)
                         {
                             // Call trigger
-                            $result=$this->call_trigger('PROPAL_SUPPLIER_CREATE', $user);
+                            $result = $this->call_trigger('PROPAL_SUPPLIER_CREATE', $user);
                             if ($result < 0) { $error++; }
                             // End call triggers
                         }
                     }
                     else
                     {
-                        $this->error=$this->db->lasterror();
+                        $this->error = $this->db->lasterror();
                         $error++;
                     }
                 }
             }
             else
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $error++;
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->db->commit();
                 dol_syslog(get_class($this)."::create done id=".$this->id);
@@ -1093,7 +1093,7 @@ class SupplierProposal extends CommonObject
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -1111,7 +1111,7 @@ class SupplierProposal extends CommonObject
     public function create_from($user)
     {
         // phpcs:enable
-        $this->products=$this->lines;
+        $this->products = $this->lines;
 
         return $this->create($user);
     }
@@ -1125,31 +1125,31 @@ class SupplierProposal extends CommonObject
      */
     public function createFromClone(User $user, $fromid = 0)
     {
-        global $conf,$hookmanager;
+        global $conf, $hookmanager;
 
-        $error=0;
-        $now=dol_now();
+        $error = 0;
+        $now = dol_now();
 
         $this->db->begin();
 
         // get extrafields so they will be clone
-        foreach($this->lines as $line)
+        foreach ($this->lines as $line)
             $line->fetch_optionals();
 
         // Load source object
         $objFrom = clone $this;
 
-        $objsoc=new Societe($this->db);
+        $objsoc = new Societe($this->db);
 
         // Change socid if needed
-        if (! empty($fromid) && $fromid != $this->socid)
+        if (!empty($fromid) && $fromid != $this->socid)
         {
             if ($objsoc->fetch($fromid) > 0)
             {
-                $this->socid 				= $objsoc->id;
-                $this->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-                $this->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-                $this->fk_project			= '';
+                $this->socid = $objsoc->id;
+                $this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+                $this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+                $this->fk_project = '';
             }
 
             // TODO Change product price if multi-prices
@@ -1159,39 +1159,39 @@ class SupplierProposal extends CommonObject
             $objsoc->fetch($this->socid);
         }
 
-        $this->id=0;
-        $this->statut=0;
+        $this->id = 0;
+        $this->statut = 0;
 
-        if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
+        if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
         {
-            $this->error='ErrorSetupNotComplete';
+            $this->error = 'ErrorSetupNotComplete';
             return -1;
         }
 
         // Clear fields
-        $this->user_author	= $user->id;
-        $this->user_valid	= '';
-        $this->date			= $now;
+        $this->user_author = $user->id;
+        $this->user_valid = '';
+        $this->date = $now;
 
         // Set ref
-        require_once DOL_DOCUMENT_ROOT ."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php';
+        require_once DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php';
         $obj = $conf->global->SUPPLIER_PROPOSAL_ADDON;
         $modSupplierProposal = new $obj;
         $this->ref = $modSupplierProposal->getNextValue($objsoc, $this);
 
         // Create clone
         $this->context['createfromclone'] = 'createfromclone';
-        $result=$this->create($user);
+        $result = $this->create($user);
         if ($result < 0) $error++;
 
-        if (! $error)
+        if (!$error)
         {
             // Hook of thirdparty module
             if (is_object($hookmanager))
             {
-                $parameters=array('objFrom'=>$objFrom);
-                $action='';
-                $reshook=$hookmanager->executeHooks('createFrom', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+                $parameters = array('objFrom'=>$objFrom);
+                $action = '';
+                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
                 if ($reshook < 0) $error++;
             }
         }
@@ -1199,7 +1199,7 @@ class SupplierProposal extends CommonObject
         unset($this->context['createfromclone']);
 
         // End
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return $this->id;
@@ -1223,32 +1223,32 @@ class SupplierProposal extends CommonObject
         global $conf;
 
         $sql = "SELECT p.rowid, p.entity, p.ref, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc";
-        $sql.= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
-        $sql.= ", p.datec";
-        $sql.= ", p.date_valid as datev";
-        $sql.= ", p.date_livraison as date_livraison";
-        $sql.= ", p.model_pdf, p.extraparams";
-        $sql.= ", p.note_private, p.note_public";
-        $sql.= ", p.fk_projet as fk_project, p.fk_statut";
-        $sql.= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
-        $sql.= ", p.fk_cond_reglement";
-        $sql.= ", p.fk_mode_reglement";
-        $sql.= ', p.fk_account';
-        $sql.= ", p.fk_shipping_method";
-        $sql.= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
-        $sql.= ", c.label as statut_label";
-        $sql.= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
-        $sql.= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
-        $sql.= " WHERE p.fk_statut = c.id";
-        $sql.= " AND p.entity IN (".getEntity('supplier_proposal').")";
-        if ($ref) $sql.= " AND p.ref='".$ref."'";
-        else $sql.= " AND p.rowid=".$rowid;
+        $sql .= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
+        $sql .= ", p.datec";
+        $sql .= ", p.date_valid as datev";
+        $sql .= ", p.date_livraison as date_livraison";
+        $sql .= ", p.model_pdf, p.extraparams";
+        $sql .= ", p.note_private, p.note_public";
+        $sql .= ", p.fk_projet as fk_project, p.fk_statut";
+        $sql .= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
+        $sql .= ", p.fk_cond_reglement";
+        $sql .= ", p.fk_mode_reglement";
+        $sql .= ', p.fk_account';
+        $sql .= ", p.fk_shipping_method";
+        $sql .= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
+        $sql .= ", c.label as statut_label";
+        $sql .= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
+        $sql .= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
+        $sql .= " WHERE p.fk_statut = c.id";
+        $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
+        if ($ref) $sql .= " AND p.ref='".$ref."'";
+        else $sql .= " AND p.rowid=".$rowid;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
@@ -1278,21 +1278,21 @@ class SupplierProposal extends CommonObject
                 $this->statut_libelle       = $obj->statut_label;
                 $this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
                 $this->datev                = $this->db->jdate($obj->datev); // TODO deprecated
-                $this->date_creation		= $this->db->jdate($obj->datec); //Creation date
-                $this->date_validation		= $this->db->jdate($obj->datev); //Validation date
+                $this->date_creation = $this->db->jdate($obj->datec); //Creation date
+                $this->date_validation = $this->db->jdate($obj->datev); //Validation date
                 $this->date_livraison       = $this->db->jdate($obj->date_livraison);
-                $this->shipping_method_id   = ($obj->fk_shipping_method>0)?$obj->fk_shipping_method:null;
+                $this->shipping_method_id   = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
 
                 $this->mode_reglement_id    = $obj->fk_mode_reglement;
                 $this->mode_reglement_code  = $obj->mode_reglement_code;
                 $this->mode_reglement       = $obj->mode_reglement;
-                $this->fk_account           = ($obj->fk_account>0)?$obj->fk_account:null;
+                $this->fk_account           = ($obj->fk_account > 0) ? $obj->fk_account : null;
                 $this->cond_reglement_id    = $obj->fk_cond_reglement;
                 $this->cond_reglement_code  = $obj->cond_reglement_code;
                 $this->cond_reglement       = $obj->cond_reglement;
                 $this->cond_reglement_doc   = $obj->cond_reglement_libelle_doc;
 
-                $this->extraparams			= (array) json_decode($obj->extraparams, true);
+                $this->extraparams = (array) json_decode($obj->extraparams, true);
 
                 $this->user_author_id = $obj->fk_user_author;
                 $this->user_valid_id  = $obj->fk_user_valid;
@@ -1300,9 +1300,9 @@ class SupplierProposal extends CommonObject
 
                 // Multicurrency
                 $this->fk_multicurrency 		= $obj->fk_multicurrency;
-                $this->multicurrency_code 		= $obj->multicurrency_code;
+                $this->multicurrency_code = $obj->multicurrency_code;
                 $this->multicurrency_tx 		= $obj->multicurrency_tx;
-                $this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+                $this->multicurrency_total_ht = $obj->multicurrency_total_ht;
                 $this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
                 $this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
@@ -1321,14 +1321,14 @@ class SupplierProposal extends CommonObject
 
                 // Lines of supplier proposals
                 $sql = "SELECT d.rowid, d.fk_supplier_proposal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
-                $sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
-                $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
-                $sql.= ' d.ref_fourn as ref_produit_fourn,';
-                $sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc, d.fk_unit';
-                $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
-                $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
-                $sql.= " WHERE d.fk_supplier_proposal = ".$this->id;
-                $sql.= " ORDER by d.rang";
+                $sql .= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
+                $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
+                $sql .= ' d.ref_fourn as ref_produit_fourn,';
+                $sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc, d.fk_unit';
+                $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
+                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
+                $sql .= " WHERE d.fk_supplier_proposal = ".$this->id;
+                $sql .= " ORDER by d.rang";
 
                 $result = $this->db->query($sql);
                 if ($result)
@@ -1342,13 +1342,13 @@ class SupplierProposal extends CommonObject
 
                         $line                   = new SupplierProposalLine($this->db);
 
-                        $line->rowid			= $objp->rowid; // deprecated
-                        $line->id				= $objp->rowid;
-                        $line->fk_supplier_proposal		= $objp->fk_supplier_proposal;
-                        $line->fk_parent_line	= $objp->fk_parent_line;
+                        $line->rowid = $objp->rowid; // deprecated
+                        $line->id = $objp->rowid;
+                        $line->fk_supplier_proposal = $objp->fk_supplier_proposal;
+                        $line->fk_parent_line = $objp->fk_parent_line;
                         $line->product_type     = $objp->product_type;
                         $line->label            = $objp->custom_label;
-                        $line->desc             = $objp->description;  // Description ligne
+                        $line->desc             = $objp->description; // Description ligne
                         $line->qty              = $objp->qty;
                         $line->tva_tx           = $objp->tva_tx;
                         $line->localtax1_tx		= $objp->localtax1_tx;
@@ -1364,8 +1364,8 @@ class SupplierProposal extends CommonObject
                         $line->total_localtax2	= $objp->total_localtax2;
                         $line->total_ttc        = $objp->total_ttc;
                           $line->fk_fournprice 	= $objp->fk_fournprice;
-                        $marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
-                        $line->pa_ht 			= $marginInfos[0];
+                        $marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+                        $line->pa_ht = $marginInfos[0];
                         $line->marge_tx			= $marginInfos[1];
                         $line->marque_tx		= $marginInfos[2];
                         $line->special_code     = $objp->special_code;
@@ -1373,25 +1373,25 @@ class SupplierProposal extends CommonObject
 
                         $line->fk_product       = $objp->fk_product;
 
-                        $line->ref				= $objp->product_ref;		// deprecated
-                        $line->product_ref		= $objp->product_ref;
-                        $line->libelle			= $objp->product_label;		// deprecated
-                        $line->product_label	= $objp->product_label;
-                        $line->product_desc     = $objp->product_desc; 		// Description produit
+                        $line->ref = $objp->product_ref; // deprecated
+                        $line->product_ref = $objp->product_ref;
+                        $line->libelle = $objp->product_label; // deprecated
+                        $line->product_label = $objp->product_label;
+                        $line->product_desc     = $objp->product_desc; // Description produit
                         $line->fk_product_type  = $objp->fk_product_type;
 
-                        $line->ref_fourn		= $objp->ref_produit_fourn;
+                        $line->ref_fourn = $objp->ref_produit_fourn;
 
                         // Multicurrency
-                        $line->fk_multicurrency 		= $objp->fk_multicurrency;
-                        $line->multicurrency_code 		= $objp->multicurrency_code;
+                        $line->fk_multicurrency = $objp->fk_multicurrency;
+                        $line->multicurrency_code = $objp->multicurrency_code;
                         $line->multicurrency_subprice 	= $objp->multicurrency_subprice;
                         $line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
                         $line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
                         $line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
-                        $line->fk_unit					= $objp->fk_unit;
+                        $line->fk_unit = $objp->fk_unit;
 
-                        $this->lines[$i]        = $line;
+                        $this->lines[$i] = $line;
 
                         $i++;
                     }
@@ -1399,7 +1399,7 @@ class SupplierProposal extends CommonObject
                 }
                 else
                 {
-                    $this->error=$this->db->error();
+                    $this->error = $this->db->error();
                     return -1;
                 }
 
@@ -1410,12 +1410,12 @@ class SupplierProposal extends CommonObject
                 return 1;
             }
 
-            $this->error="Record Not Found";
+            $this->error = "Record Not Found";
             return 0;
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -1431,13 +1431,13 @@ class SupplierProposal extends CommonObject
     {
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        global $conf,$langs;
+        global $conf, $langs;
 
-        $error=0;
-        $now=dol_now();
+        $error = 0;
+        $now = dol_now();
 
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->creer))
-           || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->supplier_proposal->validate_advance)))
+        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))
+           || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))
         {
             $this->db->begin();
 
@@ -1446,7 +1446,7 @@ class SupplierProposal extends CommonObject
             $soc->fetch($this->socid);
 
             // Define new ref
-            if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+            if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
             {
                 $num = $this->getNextNumRef($soc);
             }
@@ -1457,28 +1457,28 @@ class SupplierProposal extends CommonObject
             $this->newref = $num;
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-            $sql.= " SET ref = '".$this->db->escape($num)."',";
-            $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql .= " SET ref = '".$this->db->escape($num)."',";
+            $sql .= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
             dol_syslog(get_class($this)."::valid", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (! $resql)
+            $resql = $this->db->query($sql);
+            if (!$resql)
             {
                 dol_print_error($this->db);
                 $error++;
             }
 
                // Trigger calls
-            if (! $error && ! $notrigger)
+            if (!$error && !$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE', $user);
+                $result = $this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $this->oldref = $this->ref;
 
@@ -1486,41 +1486,41 @@ class SupplierProposal extends CommonObject
                 if (preg_match('/^[\(]?PROV/i', $this->ref))
                 {
                 	// Now we rename also files into index
-                	$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref)+1).")), filepath = 'supplier_proposal/".$this->db->escape($this->newref)."'";
-                	$sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'supplier_proposal/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+                	$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'supplier_proposal/".$this->db->escape($this->newref)."'";
+                	$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'supplier_proposal/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
                 	$resql = $this->db->query($sql);
-                	if (! $resql) { $error++; $this->error = $this->db->lasterror(); }
+                	if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
 
                 	// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
                 	$oldref = dol_sanitizeFileName($this->ref);
                     $newref = dol_sanitizeFileName($num);
                     $dirsource = $conf->supplier_proposal->dir_output.'/'.$oldref;
                     $dirdest = $conf->supplier_proposal->dir_output.'/'.$newref;
-                    if (! $error && file_exists($dirsource))
+                    if (!$error && file_exists($dirsource))
                     {
                         dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
                         if (@rename($dirsource, $dirdest))
                         {
                             dol_syslog("Rename ok");
                             // Rename docs starting with $oldref with $newref
-                            $listoffiles=dol_dir_list($conf->supplier_proposal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-                            foreach($listoffiles as $fileentry)
+                            $listoffiles = dol_dir_list($conf->supplier_proposal->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+                            foreach ($listoffiles as $fileentry)
                             {
-                                $dirsource=$fileentry['name'];
-                                $dirdest=preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-                                $dirsource=$fileentry['path'].'/'.$dirsource;
-                                $dirdest=$fileentry['path'].'/'.$dirdest;
+                                $dirsource = $fileentry['name'];
+                                $dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+                                $dirsource = $fileentry['path'].'/'.$dirsource;
+                                $dirdest = $fileentry['path'].'/'.$dirdest;
                                 @rename($dirsource, $dirdest);
                             }
                         }
                     }
                 }
 
-                $this->ref=$num;
-                $this->brouillon=0;
+                $this->ref = $num;
+                $this->brouillon = 0;
                 $this->statut = 1;
-                $this->user_valid_id=$user->id;
-                $this->datev=$now;
+                $this->user_valid_id = $user->id;
+                $this->datev = $now;
 
                 $this->db->commit();
                 return 1;
@@ -1549,11 +1549,11 @@ class SupplierProposal extends CommonObject
     public function set_date_livraison($user, $date_livraison)
     {
         // phpcs:enable
-        if (! empty($user->rights->supplier_proposal->creer))
+        if (!empty($user->rights->supplier_proposal->creer))
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
-            $sql.= " SET date_livraison = ".($date_livraison!=''?"'".$this->db->idate($date_livraison)."'":'null');
-            $sql.= " WHERE rowid = ".$this->id;
+            $sql .= " SET date_livraison = ".($date_livraison != '' ? "'".$this->db->idate($date_livraison)."'" : 'null');
+            $sql .= " WHERE rowid = ".$this->id;
 
             if ($this->db->query($sql))
             {
@@ -1562,7 +1562,7 @@ class SupplierProposal extends CommonObject
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
                 return -1;
             }
@@ -1580,16 +1580,16 @@ class SupplierProposal extends CommonObject
     public function set_remise_percent($user, $remise)
     {
         // phpcs:enable
-        $remise=trim($remise)?trim($remise):0;
+        $remise = trim($remise) ?trim($remise) : 0;
 
-        if (! empty($user->rights->supplier_proposal->creer))
+        if (!empty($user->rights->supplier_proposal->creer))
         {
             $remise = price2num($remise);
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET remise_percent = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-            if ($this->db->query($sql) )
+            if ($this->db->query($sql))
             {
                 $this->remise_percent = $remise;
                 $this->update_price(1);
@@ -1597,7 +1597,7 @@ class SupplierProposal extends CommonObject
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 return -1;
             }
         }
@@ -1615,17 +1615,17 @@ class SupplierProposal extends CommonObject
     public function set_remise_absolue($user, $remise)
     {
         // phpcs:enable
-        $remise=trim($remise)?trim($remise):0;
+        $remise = trim($remise) ?trim($remise) : 0;
 
-        if (! empty($user->rights->supplier_proposal->creer))
+        if (!empty($user->rights->supplier_proposal->creer))
         {
             $remise = price2num($remise);
 
             $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
-            $sql.= " SET remise_absolue = ".$remise;
-            $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+            $sql .= " SET remise_absolue = ".$remise;
+            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-            if ($this->db->query($sql) )
+            if ($this->db->query($sql))
             {
                 $this->remise_absolue = $remise;
                 $this->update_price(1);
@@ -1633,7 +1633,7 @@ class SupplierProposal extends CommonObject
             }
             else
             {
-                $this->error=$this->db->error();
+                $this->error = $this->db->error();
                 return -1;
             }
         }
@@ -1652,30 +1652,30 @@ class SupplierProposal extends CommonObject
      */
     public function reopen($user, $statut, $note = '', $notrigger = 0)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->statut = $statut;
-        $error=0;
+        $error = 0;
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql.= " SET fk_statut = ".$this->statut.",";
-        if (! empty($note)) $sql.= " note_private = '".$this->db->escape($note)."',";
-        $sql.= " date_cloture=NULL, fk_user_cloture=NULL";
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET fk_statut = ".$this->statut.",";
+        if (!empty($note)) $sql .= " note_private = '".$this->db->escape($note)."',";
+        $sql .= " date_cloture=NULL, fk_user_cloture=NULL";
+        $sql .= " WHERE rowid = ".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::reopen", 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)
             {
                 // Call trigger
-                $result=$this->call_trigger('SUPPLIER_PROPOSAL_REOPEN', $user);
+                $result = $this->call_trigger('SUPPLIER_PROPOSAL_REOPEN', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -1686,14 +1686,14 @@ class SupplierProposal extends CommonObject
         {
             if (!empty($this->errors))
             {
-                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
         {
@@ -1713,46 +1713,46 @@ class SupplierProposal extends CommonObject
      */
     public function cloture($user, $status, $note)
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->statut = $status;
-        $error=0;
-        $now=dol_now();
+        $error = 0;
+        $now = dol_now();
 
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql.= " SET fk_statut = ".$status.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET fk_statut = ".$status.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED:$this->modelpdf;
+            $modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
             $triggerName = 'SUPPLIER_PROPOSAL_CLOSE_REFUSED';
 
             if ($status == 2)
             {
-                $triggerName='SUPPLIER_PROPOSAL_CLOSE_SIGNED';
-                $modelpdf=$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL?$conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL:$this->modelpdf;
+                $triggerName = 'SUPPLIER_PROPOSAL_CLOSE_SIGNED';
+                $modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
 
-                if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
+                if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
                 {
                     $result = $this->updateOrCreatePriceFournisseur($user);
                 }
             }
             if ($status == 4)
             {
-                $triggerName='SUPPLIER_PROPOSAL_CLASSIFY_BILLED';
+                $triggerName = 'SUPPLIER_PROPOSAL_CLASSIFY_BILLED';
             }
 
             if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
             {
                 // Define output language
                 $outputlangs = $langs;
-                if (! empty($conf->global->MAIN_MULTILANGS)) {
+                if (!empty($conf->global->MAIN_MULTILANGS)) {
                     $outputlangs = new Translate("", $conf);
-                    $newlang=(GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $this->thirdparty->default_lang);
+                    $newlang = (GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $this->thirdparty->default_lang);
                     $outputlangs->setDefaultLang($newlang);
                 }
                 //$ret=$object->fetch($id);    // Reload to get new records
@@ -1760,11 +1760,11 @@ class SupplierProposal extends CommonObject
             }
 
             // Call trigger
-            $result=$this->call_trigger($triggerName, $user);
+            $result = $this->call_trigger($triggerName, $user);
             if ($result < 0) { $error++; }
             // End call triggers
 
-            if ( ! $error )
+            if (!$error)
             {
                 $this->db->commit();
                 return 1;
@@ -1777,8 +1777,8 @@ class SupplierProposal extends CommonObject
         }
         else
         {
-            $this->error=$this->db->lasterror();
-            $this->errors[]=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
+            $this->errors[] = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -1826,14 +1826,14 @@ class SupplierProposal extends CommonObject
      */
     public function updatePriceFournisseur($idProductFournPrice, $product, $user)
     {
-        $price=price2num($product->subprice*$product->qty, 'MU');
+        $price = price2num($product->subprice * $product->qty, 'MU');
         $unitPrice = price2num($product->subprice, 'MU');
 
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'product_fournisseur_price SET '.(!empty($product->ref_fourn) ? 'ref_fourn = "'.$product->ref_fourn.'", ' : '').' price ='.$price.', unitprice ='.$unitPrice.' WHERE rowid = '.$idProductFournPrice;
 
         $resql = $this->db->query($sql);
         if (!$resql) {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
         }
@@ -1848,10 +1848,10 @@ class SupplierProposal extends CommonObject
      */
     public function createPriceFournisseur($product, $user)
     {
-        $price=price2num($product->subprice*$product->qty, 'MU');
-        $qty=price2num($product->qty);
+        $price = price2num($product->subprice * $product->qty, 'MU');
+        $qty = price2num($product->qty);
         $unitPrice = price2num($product->subprice, 'MU');
-        $now=dol_now();
+        $now = dol_now();
 
         $values = array(
             "'".$this->db->idate($now)."'",
@@ -1870,7 +1870,7 @@ class SupplierProposal extends CommonObject
 
         $resql = $this->db->query($sql);
         if (!$resql) {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
         }
@@ -1886,7 +1886,7 @@ class SupplierProposal extends CommonObject
     public function setDraft($user)
     {
         // phpcs:enable
-        global $conf,$langs;
+        global $conf, $langs;
 
         $error = 0;
 
@@ -1897,8 +1897,8 @@ class SupplierProposal extends CommonObject
         }
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+        $sql .= " WHERE rowid = ".$this->id;
 
         if ($this->db->query($sql))
         {
@@ -1908,12 +1908,12 @@ class SupplierProposal extends CommonObject
 
             if (!$error) {
                 // Call trigger
-                $result=$this->call_trigger('SUPPLIER_PROPOSAL_UNVALIDATE', $user);
+                $result = $this->call_trigger('SUPPLIER_PROPOSAL_UNVALIDATE', $user);
                 if ($result < 0) $error++;
             }
 
             if (!$error) {
-                $this->statut=self::STATUS_DRAFT;
+                $this->statut = self::STATUS_DRAFT;
                 $this->brouillon = 1;
                 $this->db->commit();
                 return 1;
@@ -1946,30 +1946,30 @@ class SupplierProposal extends CommonObject
     public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datec', $sortorder = 'DESC')
     {
         // phpcs:enable
-        global $conf,$user;
+        global $conf, $user;
 
         $ga = array();
 
         $sql = "SELECT s.rowid, s.nom as name, s.client,";
-        $sql.= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
-        $sql.= " p.datep as dp, p.fin_validite as datelimite";
-        if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-        if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql.= " WHERE p.entity IN (".getEntity('supplier_proposal').")";
-        $sql.= " AND p.fk_soc = s.rowid";
-        $sql.= " AND p.fk_statut = c.id";
-        if (! $user->rights->societe->client->voir && ! $socid) //restriction
+        $sql .= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
+        $sql .= " p.datep as dp, p.fin_validite as datelimite";
+        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
+        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        $sql .= " WHERE p.entity IN (".getEntity('supplier_proposal').")";
+        $sql .= " AND p.fk_soc = s.rowid";
+        $sql .= " AND p.fk_statut = c.id";
+        if (!$user->rights->societe->client->voir && !$socid) //restriction
         {
-            $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
         }
-        if ($socid) $sql.= " AND s.rowid = ".$socid;
-        if ($draft)	$sql.= " AND p.fk_statut = 0";
-        if ($notcurrentuser > 0) $sql.= " AND p.fk_user_author <> ".$user->id;
-        $sql.= $this->db->order($sortfield, $sortorder);
-        $sql.= $this->db->plimit($limit, $offset);
+        if ($socid) $sql .= " AND s.rowid = ".$socid;
+        if ($draft)	$sql .= " AND p.fk_statut = 0";
+        if ($notcurrentuser > 0) $sql .= " AND p.fk_user_author <> ".$user->id;
+        $sql .= $this->db->order($sortfield, $sortorder);
+        $sql .= $this->db->plimit($limit, $offset);
 
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $num = $this->db->num_rows($result);
@@ -1990,7 +1990,7 @@ class SupplierProposal extends CommonObject
                     }
                     else
                     {
-                        $ga[$i]['id']	= $obj->supplier_proposalid;
+                        $ga[$i]['id'] = $obj->supplier_proposalid;
                         $ga[$i]['ref'] 	= $obj->ref;
                         $ga[$i]['name'] = $obj->name;
                     }
@@ -2016,22 +2016,22 @@ class SupplierProposal extends CommonObject
      */
     public function delete($user, $notrigger = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error=0;
+        $error = 0;
 
         $this->db->begin();
 
-        if (! $notrigger)
+        if (!$notrigger)
         {
             // Call trigger
-            $result=$this->call_trigger('SUPPLIER_PROPOSAL_DELETE', $user);
+            $result = $this->call_trigger('SUPPLIER_PROPOSAL_DELETE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
         }
 
-        if (! $error)
+        if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal = ".$this->id;
             if ($this->db->query($sql))
@@ -2043,33 +2043,33 @@ class SupplierProposal extends CommonObject
                     $res = $this->deleteObjectLinked();
                     if ($res < 0) $error++;
 
-                    if (! $error)
+                    if (!$error)
                     {
                         // We remove directory
                         $ref = dol_sanitizeFileName($this->ref);
                         if ($conf->supplier_proposal->dir_output && !empty($this->ref))
                         {
-                            $dir = $conf->supplier_proposal->dir_output . "/" . $ref ;
-                            $file = $dir . "/" . $ref . ".pdf";
+                            $dir = $conf->supplier_proposal->dir_output."/".$ref;
+                            $file = $dir."/".$ref.".pdf";
                             if (file_exists($file))
                             {
                                 dol_delete_preview($this);
 
-                                if (! dol_delete_file($file, 0, 0, 0, $this)) // For triggers
+                                if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
                                 {
-                                    $this->error='ErrorFailToDeleteFile';
-                                    $this->errors=array('ErrorFailToDeleteFile');
+                                    $this->error = 'ErrorFailToDeleteFile';
+                                    $this->errors = array('ErrorFailToDeleteFile');
                                     $this->db->rollback();
                                     return 0;
                                 }
                             }
                             if (file_exists($dir))
                             {
-                                $res=@dol_delete_dir_recursive($dir);
-                                if (! $res)
+                                $res = @dol_delete_dir_recursive($dir);
+                                if (!$res)
                                 {
-                                    $this->error='ErrorFailToDeleteDir';
-                                    $this->errors=array('ErrorFailToDeleteDir');
+                                    $this->error = 'ErrorFailToDeleteDir';
+                                    $this->errors = array('ErrorFailToDeleteDir');
                                     $this->db->rollback();
                                     return 0;
                                 }
@@ -2078,21 +2078,21 @@ class SupplierProposal extends CommonObject
                     }
 
                     // Removed extrafields
-                    if (! $error)
+                    if (!$error)
                     {
                         if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
                         {
-                            $result=$this->deleteExtraFields();
+                            $result = $this->deleteExtraFields();
                             if ($result < 0)
                             {
                                 $error++;
-                                $errorflag=-4;
+                                $errorflag = -4;
                                 dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
                             }
                         }
                     }
 
-                    if (! $error)
+                    if (!$error)
                     {
                         dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
                         $this->db->commit();
@@ -2100,21 +2100,21 @@ class SupplierProposal extends CommonObject
                     }
                     else
                     {
-                        $this->error=$this->db->lasterror();
+                        $this->error = $this->db->lasterror();
                         $this->db->rollback();
                         return 0;
                     }
                 }
                 else
                 {
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -3;
                 }
             }
             else
             {
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
@@ -2135,10 +2135,10 @@ class SupplierProposal extends CommonObject
     public function info($id)
     {
         $sql = "SELECT c.rowid, ";
-        $sql.= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
-        $sql.= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
-        $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
-        $sql.= " WHERE c.rowid = ".$id;
+        $sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
+        $sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
+        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
+        $sql .= " WHERE c.rowid = ".$id;
 
         $result = $this->db->query($sql);
 
@@ -2156,20 +2156,20 @@ class SupplierProposal extends CommonObject
 
                 $cuser = new User($this->db);
                 $cuser->fetch($obj->fk_user_author);
-                $this->user_creation     = $cuser;
+                $this->user_creation = $cuser;
 
                 if ($obj->fk_user_valid)
                 {
                     $vuser = new User($this->db);
                     $vuser->fetch($obj->fk_user_valid);
-                    $this->user_validation     = $vuser;
+                    $this->user_validation = $vuser;
                 }
 
                 if ($obj->fk_user_cloture)
                 {
                     $cluser = new User($this->db);
                     $cluser->fetch($obj->fk_user_cloture);
-                    $this->user_cloture     = $cluser;
+                    $this->user_cloture = $cluser;
                 }
             }
             $this->db->free($result);
@@ -2209,24 +2209,24 @@ class SupplierProposal extends CommonObject
     	{
     		global $langs;
     		$langs->load("supplier_proposal");
-    		$this->labelStatus[self::STATUS_DRAFT]=$langs->trans("SupplierProposalStatusDraft");
-    		$this->labelStatus[self::STATUS_VALIDATED]=$langs->trans("SupplierProposalStatusValidated");
-    		$this->labelStatus[self::STATUS_SIGNED]=$langs->trans("SupplierProposalStatusSigned");
-    		$this->labelStatus[self::STATUS_NOTSIGNED]=$langs->trans("SupplierProposalStatusNotSigned");
-    		$this->labelStatus[self::STATUS_CLOSE]=$langs->trans("SupplierProposalStatusClosed");
-    		$this->labelStatusShort[self::STATUS_DRAFT]=$langs->trans("SupplierProposalStatusDraftShort");
-    		$this->labelStatusShort[self::STATUS_VALIDATED]=$langs->trans("Opened");
-    		$this->labelStatusShort[self::STATUS_SIGNED]=$langs->trans("SupplierProposalStatusSignedShort");
-    		$this->labelStatusShort[self::STATUS_NOTSIGNED]=$langs->trans("SupplierProposalStatusNotSignedShort");
-    		$this->labelStatusShort[self::STATUS_CLOSE]=$langs->trans("SupplierProposalStatusClosedShort");
+    		$this->labelStatus[self::STATUS_DRAFT] = $langs->trans("SupplierProposalStatusDraft");
+    		$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans("SupplierProposalStatusValidated");
+    		$this->labelStatus[self::STATUS_SIGNED] = $langs->trans("SupplierProposalStatusSigned");
+    		$this->labelStatus[self::STATUS_NOTSIGNED] = $langs->trans("SupplierProposalStatusNotSigned");
+    		$this->labelStatus[self::STATUS_CLOSE] = $langs->trans("SupplierProposalStatusClosed");
+    		$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans("SupplierProposalStatusDraftShort");
+    		$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans("Opened");
+    		$this->labelStatusShort[self::STATUS_SIGNED] = $langs->trans("SupplierProposalStatusSignedShort");
+    		$this->labelStatusShort[self::STATUS_NOTSIGNED] = $langs->trans("SupplierProposalStatusNotSignedShort");
+    		$this->labelStatusShort[self::STATUS_CLOSE] = $langs->trans("SupplierProposalStatusClosedShort");
     	}
 
-    	$statusnew='';
-    	if ($status==self::STATUS_DRAFT) $statusnew='status0';
-    	elseif ($status==self::STATUS_VALIDATED) $statusnew='status1';
-    	elseif ($status==self::STATUS_SIGNED) $statusnew='status3';
-    	elseif ($status==self::STATUS_NOTSIGNED) $statusnew='status5';
-    	elseif ($status==self::STATUS_CLOSE) $statusnew='status6';
+    	$statusnew = '';
+    	if ($status == self::STATUS_DRAFT) $statusnew = 'status0';
+    	elseif ($status == self::STATUS_VALIDATED) $statusnew = 'status1';
+    	elseif ($status == self::STATUS_SIGNED) $statusnew = 'status3';
+    	elseif ($status == self::STATUS_NOTSIGNED) $statusnew = 'status5';
+    	elseif ($status == self::STATUS_CLOSE) $statusnew = 'status6';
 
     	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusnew, $mode);
     }
@@ -2245,51 +2245,51 @@ class SupplierProposal extends CommonObject
         // phpcs:enable
         global $conf, $user, $langs;
 
-        $now=dol_now();
+        $now = dol_now();
 
-        $this->nbtodo=$this->nbtodolate=0;
+        $this->nbtodo = $this->nbtodolate = 0;
         $clause = " WHERE";
 
         $sql = "SELECT p.rowid, p.ref, p.datec as datec";
-        $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
         if (!$user->rights->societe->client->voir && !$user->socid)
         {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
+            $sql .= " WHERE sc.fk_user = ".$user->id;
             $clause = " AND";
         }
-        $sql.= $clause." p.entity IN (".getEntity('supplier_proposal').")";
-        if ($mode == 'opened') $sql.= " AND p.fk_statut = 1";
-        if ($mode == 'signed') $sql.= " AND p.fk_statut = 2";
-        if ($user->socid) $sql.= " AND p.fk_soc = ".$user->socid;
+        $sql .= $clause." p.entity IN (".getEntity('supplier_proposal').")";
+        if ($mode == 'opened') $sql .= " AND p.fk_statut = 1";
+        if ($mode == 'signed') $sql .= " AND p.fk_statut = 2";
+        if ($user->socid) $sql .= " AND p.fk_soc = ".$user->socid;
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
 			$label = $labelShort = '';
 			$status = '';
             if ($mode == 'opened') {
-                $delay_warning=$conf->supplier_proposal->cloture->warning_delay;
+                $delay_warning = $conf->supplier_proposal->cloture->warning_delay;
                 $status = self::STATUS_VALIDATED;
                 $label = $langs->trans("SupplierProposalsToClose");
                 $labelShort = $langs->trans("ToAcceptRefuse");
             }
             if ($mode == 'signed') {
-                $delay_warning=$conf->supplier_proposal->facturation->warning_delay;
+                $delay_warning = $conf->supplier_proposal->facturation->warning_delay;
                 $status = self::STATUS_SIGNED;
-                $label = $langs->trans("SupplierProposalsToProcess");      // May be billed or ordered
+                $label = $langs->trans("SupplierProposalsToProcess"); // May be billed or ordered
 				$labelShort = $langs->trans("ToClose");
             }
 
             $response = new WorkboardResponse();
-            $response->warning_delay = $delay_warning/60/60/24;
+            $response->warning_delay = $delay_warning / 60 / 60 / 24;
             $response->label = $label;
             $response->labelShort = $labelShort;
             $response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut='.$status;
             $response->img = img_object('', "propal");
 
             // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
                 $response->nbtodo++;
                 if ($mode == 'opened')
@@ -2307,7 +2307,7 @@ class SupplierProposal extends CommonObject
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -2322,14 +2322,14 @@ class SupplierProposal extends CommonObject
      */
     public function initAsSpecimen()
     {
-        global $user,$langs,$conf;
+        global $user, $langs, $conf;
 
         // Load array of products prodids
         $num_prods = 0;
         $prodids = array();
         $sql = "SELECT rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."product";
-        $sql.= " WHERE entity IN (".getEntity('product').")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."product";
+        $sql .= " WHERE entity IN (".getEntity('product').")";
         $resql = $this->db->query($sql);
         if ($resql)
         {
@@ -2344,51 +2344,51 @@ class SupplierProposal extends CommonObject
         }
 
         // Initialise parametres
-        $this->id=0;
+        $this->id = 0;
         $this->ref = 'SPECIMEN';
-        $this->specimen=1;
+        $this->specimen = 1;
         $this->socid = 1;
         $this->date = time();
         $this->cond_reglement_id   = 1;
         $this->cond_reglement_code = 'RECEP';
         $this->mode_reglement_id   = 7;
         $this->mode_reglement_code = 'CHQ';
-        $this->note_public='This is a comment (public)';
-        $this->note_private='This is a comment (private)';
+        $this->note_public = 'This is a comment (public)';
+        $this->note_private = 'This is a comment (private)';
         // Lines
         $nbp = 5;
         $xnbp = 0;
         while ($xnbp < $nbp)
         {
-            $line=new SupplierProposalLine($this->db);
-            $line->desc=$langs->trans("Description")." ".$xnbp;
-            $line->qty=1;
-            $line->subprice=100;
-            $line->tva_tx=19.6;
-            $line->localtax1_tx=0;
-            $line->localtax2_tx=0;
+            $line = new SupplierProposalLine($this->db);
+            $line->desc = $langs->trans("Description")." ".$xnbp;
+            $line->qty = 1;
+            $line->subprice = 100;
+            $line->tva_tx = 19.6;
+            $line->localtax1_tx = 0;
+            $line->localtax2_tx = 0;
             if ($xnbp == 2)
             {
-                $line->total_ht=50;
-                $line->total_ttc=59.8;
-                $line->total_tva=9.8;
-                $line->remise_percent=50;
+                $line->total_ht = 50;
+                $line->total_ttc = 59.8;
+                $line->total_tva = 9.8;
+                $line->remise_percent = 50;
             }
             else
             {
-                $line->total_ht=100;
-                $line->total_ttc=119.6;
-                $line->total_tva=19.6;
-                $line->remise_percent=00;
+                $line->total_ht = 100;
+                $line->total_ttc = 119.6;
+                $line->total_tva = 19.6;
+                $line->remise_percent = 00;
             }
 
             if ($num_prods > 0)
             {
                 $prodid = mt_rand(1, $num_prods);
-                $line->fk_product=$prodids[$prodid];
+                $line->fk_product = $prodids[$prodid];
             }
 
-            $this->lines[$xnbp]=$line;
+            $this->lines[$xnbp] = $line;
 
             $this->total_ht       += $line->total_ht;
             $this->total_tva      += $line->total_tva;
@@ -2409,27 +2409,27 @@ class SupplierProposal extends CommonObject
         // phpcs:enable
         global $conf, $user;
 
-        $this->nb=array();
+        $this->nb = array();
         $clause = "WHERE";
 
         $sql = "SELECT count(p.rowid) as nb";
-        $sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
         if (!$user->rights->societe->client->voir && !$user->socid)
         {
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-            $sql.= " WHERE sc.fk_user = " .$user->id;
+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+            $sql .= " WHERE sc.fk_user = ".$user->id;
             $clause = "AND";
         }
-        $sql.= " ".$clause." p.entity IN (".getEntity('supplier_proposal').")";
+        $sql .= " ".$clause." p.entity IN (".getEntity('supplier_proposal').")";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj=$this->db->fetch_object($resql))
+            while ($obj = $this->db->fetch_object($resql))
             {
-                $this->nb["askprice"]=$obj->nb;
+                $this->nb["askprice"] = $obj->nb;
             }
             $this->db->free($resql);
             return 1;
@@ -2437,7 +2437,7 @@ class SupplierProposal extends CommonObject
         else
         {
             dol_print_error($this->db);
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -2455,9 +2455,9 @@ class SupplierProposal extends CommonObject
         global $conf, $db, $langs;
         $langs->load("supplier_proposal");
 
-        if (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
+        if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
         {
-            $mybool=false;
+            $mybool = false;
 
             $file = $conf->global->SUPPLIER_PROPOSAL_ADDON.".php";
             $classname = $conf->global->SUPPLIER_PROPOSAL_ADDON;
@@ -2468,10 +2468,10 @@ class SupplierProposal extends CommonObject
                 $dir = dol_buildpath($reldir."core/modules/supplier_proposal/");
 
                 // Load file with numbering class (if found)
-                $mybool|=@include_once $dir.$file;
+                $mybool |= @include_once $dir.$file;
             }
 
-            if (! $mybool)
+            if (!$mybool)
             {
                 dol_print_error('', "Failed to include file ".$file);
                 return '';
@@ -2487,7 +2487,7 @@ class SupplierProposal extends CommonObject
             }
             else
             {
-                $this->error=$obj->error;
+                $this->error = $obj->error;
                 return "";
             }
         }
@@ -2514,58 +2514,58 @@ class SupplierProposal extends CommonObject
     {
         global $langs, $conf, $user;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $url='';
-        $result='';
+        $url = '';
+        $result = '';
 
-        $label='<u>'.$langs->trans("ShowSupplierProposal").'</u>';
-        if (! empty($this->ref))
-        $label.= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        if (! empty($this->ref_fourn))
-            $label.= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
-        if (! empty($this->total_ht))
-            $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_tva))
-            $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-        if (! empty($this->total_ttc))
-            $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+        $label = '<u>'.$langs->trans("ShowSupplierProposal").'</u>';
+        if (!empty($this->ref))
+        $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+        if (!empty($this->ref_fourn))
+            $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_fourn;
+        if (!empty($this->total_ht))
+            $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_tva))
+            $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+        if (!empty($this->total_ttc))
+            $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
         if ($option == '') {
-            $url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id. $get_params;
+            $url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id.$get_params;
         }
         if ($option == 'document') {
-            $url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id. $get_params;
+            $url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id.$get_params;
         }
 
         if ($option !== 'nolink')
         {
             // Add param to save lastsearch_values or not
-            $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-            if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+            $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+            if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+            if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         }
 
-        $linkclose='';
+        $linkclose = '';
         if (empty($notooltip) && $user->rights->propal->lire)
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowSupplierProposal");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowSupplierProposal");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip"';
         }
 
         $linkstart = '<a href="'.$url.'"';
-        $linkstart.=$linkclose.'>';
-        $linkend='</a>';
+        $linkstart .= $linkclose.'>';
+        $linkend = '</a>';
 
-        $picto='supplier_proposal';
+        $picto = 'supplier_proposal';
 
         $result .= $linkstart;
-        if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-        if ($withpicto != 2) $result.= $this->ref;
+        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+        if ($withpicto != 2) $result .= $this->ref;
         $result .= $linkend;
 
         if ($addlinktonotes)
@@ -2597,16 +2597,16 @@ class SupplierProposal extends CommonObject
         // For other object, here we call fetch_lines. But fetch_lines does not exists on supplier proposal
 
         $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
-        $sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
-        $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
-        $sql.= ' pt.product_type, pt.rang, pt.fk_parent_line,';
-        $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
-        $sql.= ' p.description as product_desc, pt.ref_fourn as ref_supplier,';
-        $sql.= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
-        $sql.= ' WHERE pt.fk_supplier_proposal = '.$this->id;
-        $sql.= ' ORDER BY pt.rang ASC, pt.rowid';
+        $sql .= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
+        $sql .= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
+        $sql .= ' pt.product_type, pt.rang, pt.fk_parent_line,';
+        $sql .= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
+        $sql .= ' p.description as product_desc, pt.ref_fourn as ref_supplier,';
+        $sql .= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
+        $sql .= ' WHERE pt.fk_supplier_proposal = '.$this->id;
+        $sql .= ' ORDER BY pt.rang ASC, pt.rowid';
 
         dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -2619,46 +2619,46 @@ class SupplierProposal extends CommonObject
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->lines[$i]					= new SupplierProposalLine($this->db);
-                $this->lines[$i]->id				= $obj->rowid; // for backward compatibility
+                $this->lines[$i] = new SupplierProposalLine($this->db);
+                $this->lines[$i]->id = $obj->rowid; // for backward compatibility
                 $this->lines[$i]->rowid				= $obj->rowid;
                 $this->lines[$i]->label 			= $obj->custom_label;
-                $this->lines[$i]->description 		= $obj->description;
-                $this->lines[$i]->fk_product		= $obj->fk_product;
-                $this->lines[$i]->ref				= $obj->ref;
-                $this->lines[$i]->product_label		= $obj->product_label;
+                $this->lines[$i]->description = $obj->description;
+                $this->lines[$i]->fk_product = $obj->fk_product;
+                $this->lines[$i]->ref = $obj->ref;
+                $this->lines[$i]->product_label = $obj->product_label;
                 $this->lines[$i]->product_desc		= $obj->product_desc;
-                $this->lines[$i]->fk_product_type	= $obj->fk_product_type;  // deprecated
+                $this->lines[$i]->fk_product_type = $obj->fk_product_type; // deprecated
                 $this->lines[$i]->product_type		= $obj->product_type;
-                $this->lines[$i]->qty				= $obj->qty;
-                $this->lines[$i]->subprice			= $obj->subprice;
-                $this->lines[$i]->fk_remise_except 	= $obj->fk_remise_except;
-                $this->lines[$i]->remise_percent	= $obj->remise_percent;
-                $this->lines[$i]->tva_tx			= $obj->tva_tx;
+                $this->lines[$i]->qty = $obj->qty;
+                $this->lines[$i]->subprice = $obj->subprice;
+                $this->lines[$i]->fk_remise_except = $obj->fk_remise_except;
+                $this->lines[$i]->remise_percent = $obj->remise_percent;
+                $this->lines[$i]->tva_tx = $obj->tva_tx;
                 $this->lines[$i]->info_bits			= $obj->info_bits;
-                $this->lines[$i]->total_ht			= $obj->total_ht;
+                $this->lines[$i]->total_ht = $obj->total_ht;
                 $this->lines[$i]->total_tva			= $obj->total_tva;
                 $this->lines[$i]->total_ttc			= $obj->total_ttc;
-                $this->lines[$i]->fk_fournprice		= $obj->fk_fournprice;
-                $marginInfos						= getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
-                $this->lines[$i]->pa_ht				= $marginInfos[0];
-                $this->lines[$i]->marge_tx			= $marginInfos[1];
-                $this->lines[$i]->marque_tx			= $marginInfos[2];
-                $this->lines[$i]->fk_parent_line	= $obj->fk_parent_line;
-                $this->lines[$i]->special_code		= $obj->special_code;
-                $this->lines[$i]->rang				= $obj->rang;
+                $this->lines[$i]->fk_fournprice = $obj->fk_fournprice;
+                $marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
+                $this->lines[$i]->pa_ht = $marginInfos[0];
+                $this->lines[$i]->marge_tx = $marginInfos[1];
+                $this->lines[$i]->marque_tx = $marginInfos[2];
+                $this->lines[$i]->fk_parent_line = $obj->fk_parent_line;
+                $this->lines[$i]->special_code = $obj->special_code;
+                $this->lines[$i]->rang = $obj->rang;
 
-                $this->lines[$i]->ref_fourn				= $obj->ref_supplier;	// deprecated
-                $this->lines[$i]->ref_supplier			= $obj->ref_supplier;
+                $this->lines[$i]->ref_fourn = $obj->ref_supplier; // deprecated
+                $this->lines[$i]->ref_supplier = $obj->ref_supplier;
 
                 // Multicurrency
-                $this->lines[$i]->fk_multicurrency 			= $obj->fk_multicurrency;
-                $this->lines[$i]->multicurrency_code 		= $obj->multicurrency_code;
+                $this->lines[$i]->fk_multicurrency = $obj->fk_multicurrency;
+                $this->lines[$i]->multicurrency_code = $obj->multicurrency_code;
                 $this->lines[$i]->multicurrency_subprice 	= $obj->multicurrency_subprice;
                 $this->lines[$i]->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
                 $this->lines[$i]->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
                 $this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
-                $this->lines[$i]->fk_unit				 	= $obj->fk_unit;
+                $this->lines[$i]->fk_unit = $obj->fk_unit;
 
                 $i++;
             }
@@ -2668,7 +2668,7 @@ class SupplierProposal extends CommonObject
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -2690,12 +2690,12 @@ class SupplierProposal extends CommonObject
 
         $langs->load("supplier_proposal");
 
-        if (! dol_strlen($modele)) {
+        if (!dol_strlen($modele)) {
             $modele = 'aurore';
 
             if ($this->modelpdf) {
                 $modele = $this->modelpdf;
-            } elseif (! empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) {
+            } elseif (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) {
                 $modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF;
             }
         }
@@ -2738,17 +2738,17 @@ class SupplierProposalLine extends CommonObjectLine
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
     /**
      * @var string ID to identify managed object
      */
-    public $element='supplier_proposaldet';
+    public $element = 'supplier_proposaldet';
 
     /**
      * @var string Name of table without prefix where object is stored
      */
-    public $table_element='supplier_proposaldet';
+    public $table_element = 'supplier_proposaldet';
 
     public $oldline;
 
@@ -2767,12 +2767,12 @@ class SupplierProposalLine extends CommonObjectLine
      */
     public $fk_parent_line;
 
-    public $desc;          	// Description ligne
+    public $desc; // Description ligne
 
     /**
      * @var int ID
      */
-    public $fk_product;		// Id produit predefini
+    public $fk_product; // Id produit predefini
 
     /**
      * @deprecated
@@ -2807,18 +2807,18 @@ class SupplierProposalLine extends CommonObjectLine
     public $marge_tx;
     public $marque_tx;
 
-    public $special_code;	// Tag for special lines (exlusive tags)
+    public $special_code; // Tag for special lines (exlusive tags)
     // 1: frais de port
     // 2: ecotaxe
     // 3: option line (when qty = 0)
 
-    public $info_bits = 0;	// Liste d'options cumulables:
+    public $info_bits = 0; // Liste d'options cumulables:
     // Bit 0: 	0 si TVA normal - 1 si TVA NPR
     // Bit 1:	0 ligne normale - 1 si ligne de remise fixe
 
-    public $total_ht;			// Total HT  de la ligne toute quantite et incluant la remise ligne
-    public $total_tva;			// Total TVA de la ligne toute quantite et incluant la remise ligne
-    public $total_ttc;			// Total TTC de la ligne toute quantite et incluant la remise ligne
+    public $total_ht; // Total HT  de la ligne toute quantite et incluant la remise ligne
+    public $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne
+    public $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne
 
     public $date_start;
     public $date_end;
@@ -2854,12 +2854,12 @@ class SupplierProposalLine extends CommonObjectLine
      */
     public $product_desc;
 
-    public $localtax1_tx;		// Local tax 1
-    public $localtax2_tx;		// Local tax 2
-    public $localtax1_type;	// Local tax 1 type
-    public $localtax2_type;	// Local tax 2 type
-    public $total_localtax1;  	// Line total local tax 1
-    public $total_localtax2;	// Line total local tax 2
+    public $localtax1_tx; // Local tax 1
+    public $localtax2_tx; // Local tax 2
+    public $localtax1_type; // Local tax 1 type
+    public $localtax2_type; // Local tax 2 type
+    public $total_localtax1; // Line total local tax 1
+    public $total_localtax2; // Line total local tax 2
 
     public $skip_update_total; // Skip update price total for special lines
 
@@ -2885,7 +2885,7 @@ class SupplierProposalLine extends CommonObjectLine
      */
     public function __construct($db)
     {
-        $this->db= $db;
+        $this->db = $db;
     }
 
     /**
@@ -2897,31 +2897,31 @@ class SupplierProposalLine extends CommonObjectLine
     public function fetch($rowid)
     {
         $sql = 'SELECT pd.rowid, pd.fk_supplier_proposal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,';
-        $sql.= ' pd.date_start, pd.date_end,';
-        $sql.= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
-        $sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
-        $sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
-        $sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
-        $sql.= ' pd.product_type, pd.ref_fourn as ref_produit_fourn,';
-        $sql.= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc, pd.fk_unit';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
-        $sql.= ' WHERE pd.rowid = '.$rowid;
+        $sql .= ' pd.date_start, pd.date_end,';
+        $sql .= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
+        $sql .= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
+        $sql .= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
+        $sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
+        $sql .= ' pd.product_type, pd.ref_fourn as ref_produit_fourn,';
+        $sql .= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc, pd.fk_unit';
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
+        $sql .= ' WHERE pd.rowid = '.$rowid;
 
         $result = $this->db->query($sql);
         if ($result)
         {
             $objp = $this->db->fetch_object($result);
 
-            $this->id				= $objp->rowid;
-            $this->fk_supplier_proposal		= $objp->fk_supplier_proposal;
-            $this->fk_parent_line	= $objp->fk_parent_line;
+            $this->id = $objp->rowid;
+            $this->fk_supplier_proposal = $objp->fk_supplier_proposal;
+            $this->fk_parent_line = $objp->fk_parent_line;
             $this->label			= $objp->custom_label;
             $this->desc				= $objp->description;
-            $this->qty				= $objp->qty;
-            $this->subprice			= $objp->subprice;
-            $this->tva_tx			= $objp->tva_tx;
-            $this->remise_percent	= $objp->remise_percent;
+            $this->qty = $objp->qty;
+            $this->subprice = $objp->subprice;
+            $this->tva_tx = $objp->tva_tx;
+            $this->remise_percent = $objp->remise_percent;
             $this->fk_remise_except = $objp->fk_remise_except;
             $this->fk_product		= $objp->fk_product;
             $this->info_bits		= $objp->info_bits;
@@ -2932,7 +2932,7 @@ class SupplierProposalLine extends CommonObjectLine
             $this->total_tva		= $objp->total_tva;
             $this->total_ttc		= $objp->total_ttc;
 
-            $this->fk_fournprice	= $objp->fk_fournprice;
+            $this->fk_fournprice = $objp->fk_fournprice;
 
             $marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);
             $this->pa_ht			= $marginInfos[0];
@@ -2941,24 +2941,24 @@ class SupplierProposalLine extends CommonObjectLine
 
             $this->special_code		= $objp->special_code;
             $this->product_type		= $objp->product_type;
-            $this->rang				= $objp->rang;
+            $this->rang = $objp->rang;
 
-            $this->ref				= $objp->product_ref;      // deprecated
-            $this->product_ref		= $objp->product_ref;
-            $this->libelle			= $objp->product_label;  // deprecated
+            $this->ref = $objp->product_ref; // deprecated
+            $this->product_ref = $objp->product_ref;
+            $this->libelle = $objp->product_label; // deprecated
             $this->product_label	= $objp->product_label;
             $this->product_desc		= $objp->product_desc;
 
-            $this->ref_fourn		= $objp->ref_produit_forun;
+            $this->ref_fourn = $objp->ref_produit_forun;
 
             // Multicurrency
-            $this->fk_multicurrency 		= $objp->fk_multicurrency;
-            $this->multicurrency_code 		= $objp->multicurrency_code;
+            $this->fk_multicurrency = $objp->fk_multicurrency;
+            $this->multicurrency_code = $objp->multicurrency_code;
             $this->multicurrency_subprice 	= $objp->multicurrency_subprice;
             $this->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
             $this->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
             $this->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
-            $this->fk_unit				 	= $objp->fk_unit;
+            $this->fk_unit = $objp->fk_unit;
 
             $this->db->free($result);
         }
@@ -2976,31 +2976,31 @@ class SupplierProposalLine extends CommonObjectLine
      */
     public function insert($notrigger = 0)
     {
-        global $conf,$langs,$user;
+        global $conf, $langs, $user;
 
-        $error=0;
+        $error = 0;
 
         dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
         // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type=0;
-        if (empty($this->localtax2_type)) $this->localtax2_type=0;
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->rang)) $this->rang=0;
-        if (empty($this->remise)) $this->remise=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-        if (empty($this->fk_unit)) $this->fk_unit=0;
-        if (empty($this->subprice)) $this->subprice=0;
+        if (empty($this->tva_tx)) $this->tva_tx = 0;
+        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+        if (empty($this->localtax1_type)) $this->localtax1_type = 0;
+        if (empty($this->localtax2_type)) $this->localtax2_type = 0;
+        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+        if (empty($this->rang)) $this->rang = 0;
+        if (empty($this->remise)) $this->remise = 0;
+        if (empty($this->remise_percent)) $this->remise_percent = 0;
+        if (empty($this->info_bits)) $this->info_bits = 0;
+        if (empty($this->special_code)) $this->special_code = 0;
+        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+        if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
+        if (empty($this->fk_unit)) $this->fk_unit = 0;
+        if (empty($this->subprice)) $this->subprice = 0;
 
-        if (empty($this->pa_ht)) $this->pa_ht=0;
+        if (empty($this->pa_ht)) $this->pa_ht = 0;
 
         // if buy price not defined, define buyprice as configured in margin admin
         if ($this->pa_ht == 0)
@@ -3022,70 +3022,70 @@ class SupplierProposalLine extends CommonObjectLine
 
         // Insert line into database
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'supplier_proposaldet';
-        $sql.= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
-        $sql.= ' date_start, date_end,';
-        $sql.= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-        $sql.= ' subprice, remise_percent, ';
-        $sql.= ' info_bits, ';
-        $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
-        $sql.= ' ref_fourn,';
-        $sql.= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
-        $sql.= " VALUES (".$this->fk_supplier_proposal.",";
-        $sql.= " ".($this->fk_parent_line>0?"'".$this->db->escape($this->fk_parent_line)."'":"null").",";
-        $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->desc)."',";
-        $sql.= " ".($this->fk_product?"'".$this->db->escape($this->fk_product)."'":"null").",";
-        $sql.= " '".$this->db->escape($this->product_type)."',";
-        $sql.= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
-        $sql.= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
-        $sql.= " ".($this->fk_remise_except?"'".$this->db->escape($this->fk_remise_except)."'":"null").",";
-        $sql.= " ".price2num($this->qty).",";
-        $sql.= " ".price2num($this->tva_tx).",";
-        $sql.= " ".price2num($this->localtax1_tx).",";
-        $sql.= " ".price2num($this->localtax2_tx).",";
-        $sql.= " '".$this->db->escape($this->localtax1_type)."',";
-        $sql.= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql.= " ".(!empty($this->subprice)?price2num($this->subprice):"null").",";
-        $sql.= " ".price2num($this->remise_percent).",";
-        $sql.= " ".(isset($this->info_bits)?"'".$this->db->escape($this->info_bits)."'":"null").",";
-        $sql.= " ".price2num($this->total_ht).",";
-        $sql.= " ".price2num($this->total_tva).",";
-        $sql.= " ".price2num($this->total_localtax1).",";
-        $sql.= " ".price2num($this->total_localtax2).",";
-        $sql.= " ".price2num($this->total_ttc).",";
-        $sql.= " ".(!empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null").",";
-        $sql.= " ".(isset($this->pa_ht)?"'".price2num($this->pa_ht)."'":"null").",";
-        $sql.= ' '.$this->special_code.',';
-        $sql.= ' '.$this->rang.',';
-        $sql.= " '".$this->db->escape($this->ref_fourn)."'";
-        $sql.= ", ".($this->fk_multicurrency > 0?$this->fk_multicurrency:'null');
-        $sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql.= ", ".$this->multicurrency_subprice;
-        $sql.= ", ".$this->multicurrency_total_ht;
-        $sql.= ", ".$this->multicurrency_total_tva;
-        $sql.= ", ".$this->multicurrency_total_ttc;
-        $sql.= ", ".($this->fk_unit?$this->fk_unit:'null');
-        $sql.= ')';
+        $sql .= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
+        $sql .= ' date_start, date_end,';
+        $sql .= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+        $sql .= ' subprice, remise_percent, ';
+        $sql .= ' info_bits, ';
+        $sql .= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
+        $sql .= ' ref_fourn,';
+        $sql .= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
+        $sql .= " VALUES (".$this->fk_supplier_proposal.",";
+        $sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
+        $sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+        $sql .= " '".$this->db->escape($this->desc)."',";
+        $sql .= " ".($this->fk_product ? "'".$this->db->escape($this->fk_product)."'" : "null").",";
+        $sql .= " '".$this->db->escape($this->product_type)."',";
+        $sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
+        $sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
+        $sql .= " ".($this->fk_remise_except ? "'".$this->db->escape($this->fk_remise_except)."'" : "null").",";
+        $sql .= " ".price2num($this->qty).",";
+        $sql .= " ".price2num($this->tva_tx).",";
+        $sql .= " ".price2num($this->localtax1_tx).",";
+        $sql .= " ".price2num($this->localtax2_tx).",";
+        $sql .= " '".$this->db->escape($this->localtax1_type)."',";
+        $sql .= " '".$this->db->escape($this->localtax2_type)."',";
+        $sql .= " ".(!empty($this->subprice) ?price2num($this->subprice) : "null").",";
+        $sql .= " ".price2num($this->remise_percent).",";
+        $sql .= " ".(isset($this->info_bits) ? "'".$this->db->escape($this->info_bits)."'" : "null").",";
+        $sql .= " ".price2num($this->total_ht).",";
+        $sql .= " ".price2num($this->total_tva).",";
+        $sql .= " ".price2num($this->total_localtax1).",";
+        $sql .= " ".price2num($this->total_localtax2).",";
+        $sql .= " ".price2num($this->total_ttc).",";
+        $sql .= " ".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null").",";
+        $sql .= " ".(isset($this->pa_ht) ? "'".price2num($this->pa_ht)."'" : "null").",";
+        $sql .= ' '.$this->special_code.',';
+        $sql .= ' '.$this->rang.',';
+        $sql .= " '".$this->db->escape($this->ref_fourn)."'";
+        $sql .= ", ".($this->fk_multicurrency > 0 ? $this->fk_multicurrency : 'null');
+        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+        $sql .= ", ".$this->multicurrency_subprice;
+        $sql .= ", ".$this->multicurrency_total_ht;
+        $sql .= ", ".$this->multicurrency_total_tva;
+        $sql .= ", ".$this->multicurrency_total_ttc;
+        $sql .= ", ".($this->fk_unit ? $this->fk_unit : 'null');
+        $sql .= ')';
 
         dol_syslog(get_class($this).'::insert', LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
 
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-                $result=$this->insertExtraFields();
+                $result = $this->insertExtraFields();
                 if ($result < 0)
                 {
                     $error++;
                 }
             }
 
-            if (! $error && ! $notrigger)
+            if (!$error && !$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT', $user);
+                $result = $this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT', $user);
                 if ($result < 0)
                 {
                     $this->db->rollback();
@@ -3099,7 +3099,7 @@ class SupplierProposalLine extends CommonObjectLine
         }
         else
         {
-            $this->error=$this->db->error()." sql=".$sql;
+            $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
         }
@@ -3112,19 +3112,19 @@ class SupplierProposalLine extends CommonObjectLine
      */
     public function delete()
     {
-        global $conf,$langs,$user;
+        global $conf, $langs, $user;
 
-        $error=0;
+        $error = 0;
         $this->db->begin();
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".$this->id;
         dol_syslog("SupplierProposalLine::delete", LOG_DEBUG);
-        if ($this->db->query($sql) )
+        if ($this->db->query($sql))
         {
             // Remove extrafields
-            if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+            if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
             {
-                $result=$this->deleteExtraFields();
+                $result = $this->deleteExtraFields();
                 if ($result < 0)
                 {
                     $error++;
@@ -3133,7 +3133,7 @@ class SupplierProposalLine extends CommonObjectLine
             }
 
             // Call trigger
-            $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE', $user);
+            $result = $this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE', $user);
             if ($result < 0)
             {
                 $this->db->rollback();
@@ -3147,7 +3147,7 @@ class SupplierProposalLine extends CommonObjectLine
         }
         else
         {
-            $this->error=$this->db->error()." sql=".$sql;
+            $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
         }
@@ -3161,29 +3161,29 @@ class SupplierProposalLine extends CommonObjectLine
      */
     public function update($notrigger = 0)
     {
-        global $conf,$langs,$user;
+        global $conf, $langs, $user;
 
-        $error=0;
+        $error = 0;
 
         // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx=0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx=0;
-        if (empty($this->total_localtax1)) $this->total_localtax1=0;
-        if (empty($this->total_localtax2)) $this->total_localtax2=0;
-        if (empty($this->localtax1_type)) $this->localtax1_type=0;
-        if (empty($this->localtax2_type)) $this->localtax2_type=0;
-        if (empty($this->marque_tx)) $this->marque_tx=0;
-        if (empty($this->marge_tx)) $this->marge_tx=0;
-        if (empty($this->remise_percent)) $this->remise_percent=0;
-        if (empty($this->info_bits)) $this->info_bits=0;
-        if (empty($this->special_code)) $this->special_code=0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-        if (empty($this->fk_unit)) $this->fk_unit=0;
-        if (empty($this->subprice)) $this->subprice=0;
+        if (empty($this->tva_tx)) $this->tva_tx = 0;
+        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+        if (empty($this->localtax1_type)) $this->localtax1_type = 0;
+        if (empty($this->localtax2_type)) $this->localtax2_type = 0;
+        if (empty($this->marque_tx)) $this->marque_tx = 0;
+        if (empty($this->marge_tx)) $this->marge_tx = 0;
+        if (empty($this->remise_percent)) $this->remise_percent = 0;
+        if (empty($this->info_bits)) $this->info_bits = 0;
+        if (empty($this->special_code)) $this->special_code = 0;
+        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+        if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
+        if (empty($this->fk_unit)) $this->fk_unit = 0;
+        if (empty($this->subprice)) $this->subprice = 0;
 
-        if (empty($this->pa_ht)) $this->pa_ht=0;
+        if (empty($this->pa_ht)) $this->pa_ht = 0;
 
         // if buy price not defined, define buyprice as configured in margin admin
         if ($this->pa_ht == 0)
@@ -3202,61 +3202,61 @@ class SupplierProposalLine extends CommonObjectLine
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
-        $sql.= " description='".$this->db->escape($this->desc)."'";
-        $sql.= " , label=".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null");
-        $sql.= " , product_type=".$this->product_type;
-        $sql.= " , date_start=".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null");
-        $sql.= " , date_end=".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
-        $sql.= " , tva_tx='".price2num($this->tva_tx)."'";
-        $sql.= " , localtax1_tx=".price2num($this->localtax1_tx);
-        $sql.= " , localtax2_tx=".price2num($this->localtax2_tx);
-        $sql.= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
-        $sql.= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-        $sql.= " , qty='".price2num($this->qty)."'";
-        $sql.= " , subprice=".price2num($this->subprice)."";
-        $sql.= " , remise_percent=".price2num($this->remise_percent)."";
-        $sql.= " , info_bits='".$this->db->escape($this->info_bits)."'";
+        $sql .= " description='".$this->db->escape($this->desc)."'";
+        $sql .= " , label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+        $sql .= " , product_type=".$this->product_type;
+        $sql .= " , date_start=".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null");
+        $sql .= " , date_end=".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
+        $sql .= " , tva_tx='".price2num($this->tva_tx)."'";
+        $sql .= " , localtax1_tx=".price2num($this->localtax1_tx);
+        $sql .= " , localtax2_tx=".price2num($this->localtax2_tx);
+        $sql .= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+        $sql .= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
+        $sql .= " , qty='".price2num($this->qty)."'";
+        $sql .= " , subprice=".price2num($this->subprice)."";
+        $sql .= " , remise_percent=".price2num($this->remise_percent)."";
+        $sql .= " , info_bits='".$this->db->escape($this->info_bits)."'";
         if (empty($this->skip_update_total))
         {
-            $sql.= " , total_ht=".price2num($this->total_ht)."";
-            $sql.= " , total_tva=".price2num($this->total_tva)."";
-            $sql.= " , total_ttc=".price2num($this->total_ttc)."";
-            $sql.= " , total_localtax1=".price2num($this->total_localtax1)."";
-            $sql.= " , total_localtax2=".price2num($this->total_localtax2)."";
+            $sql .= " , total_ht=".price2num($this->total_ht)."";
+            $sql .= " , total_tva=".price2num($this->total_tva)."";
+            $sql .= " , total_ttc=".price2num($this->total_ttc)."";
+            $sql .= " , total_localtax1=".price2num($this->total_localtax1)."";
+            $sql .= " , total_localtax2=".price2num($this->total_localtax2)."";
         }
-        $sql.= " , fk_product_fournisseur_price=".(! empty($this->fk_fournprice)?"'".$this->db->escape($this->fk_fournprice)."'":"null");
-        $sql.= " , buy_price_ht=".price2num($this->pa_ht);
-        if (strlen($this->special_code)) $sql.= " , special_code=".$this->special_code;
-        $sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
-        if (! empty($this->rang)) $sql.= ", rang=".$this->rang;
-        $sql.= " , ref_fourn=".(! empty($this->ref_fourn)?"'".$this->db->escape($this->ref_fourn)."'":"null");
-        $sql.= " , fk_unit=".($this->fk_unit?$this->fk_unit:'null');
+        $sql .= " , fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
+        $sql .= " , buy_price_ht=".price2num($this->pa_ht);
+        if (strlen($this->special_code)) $sql .= " , special_code=".$this->special_code;
+        $sql .= " , fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
+        if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+        $sql .= " , ref_fourn=".(!empty($this->ref_fourn) ? "'".$this->db->escape($this->ref_fourn)."'" : "null");
+        $sql .= " , fk_unit=".($this->fk_unit ? $this->fk_unit : 'null');
 
         // Multicurrency
-        $sql.= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+        $sql .= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+        $sql .= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+        $sql .= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+        $sql .= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
             {
-                $result=$this->insertExtraFields();
+                $result = $this->insertExtraFields();
                 if ($result < 0)
                 {
                     $error++;
                 }
             }
 
-            if (! $error && ! $notrigger)
+            if (!$error && !$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE', $user);
+                $result = $this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE', $user);
                 if ($result < 0)
                 {
                     $this->db->rollback();
@@ -3270,7 +3270,7 @@ class SupplierProposalLine extends CommonObjectLine
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }
@@ -3290,14 +3290,14 @@ class SupplierProposalLine extends CommonObjectLine
 
         // Mise a jour ligne en base
         $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
-        $sql.= " total_ht=".price2num($this->total_ht, 'MT');
-        $sql.= ",total_tva=".price2num($this->total_tva, 'MT');
-        $sql.= ",total_ttc=".price2num($this->total_ttc, 'MT');
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " total_ht=".price2num($this->total_ht, 'MT');
+        $sql .= ",total_tva=".price2num($this->total_tva, 'MT');
+        $sql .= ",total_ttc=".price2num($this->total_ttc, 'MT');
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog("SupplierProposalLine::update_total", LOG_DEBUG);
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->db->commit();
@@ -3305,7 +3305,7 @@ class SupplierProposalLine extends CommonObjectLine
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -2;
         }