From 9fdd1357d0b8ea29965c012202a09a0e92a7bc97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 16 Dec 2019 20:21:06 +0100
Subject: [PATCH 1/4] The variable $num does not seem to be defined for all
 execution paths

---
 htdocs/core/boxes/box_activity.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 4864bcad371..40bfe965c60 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012      Charles-François BENKE <charles.fr@benke.fr>
  * Copyright (C) 2005-2015 Laurent Destailleur    <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2015 Frederic France        <frederic.france@free.fr>
+ * Copyright (C) 2014-2019 Frederic France        <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -431,7 +431,7 @@ class box_activity extends ModeleBoxes
         			$line++;
         			$j++;
         		}
-        		if ($num==0) {
+        		if (count($data)==0) {
         			$this->info_box_contents[$line][0] = array(
                         'td' => 'class="center"',
                         'text'=>$langs->trans("NoRecordedInvoices"),

From 05f1a556343df7b076b8f57c900e99fb1f7de049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 16 Dec 2019 20:27:41 +0100
Subject: [PATCH 2/4] doxygen

---
 htdocs/datapolicy/class/actions_datapolicy.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index 82b6d829544..7d467729841 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseom.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -384,7 +384,7 @@ class ActionsDatapolicy
      * @param Object	 	$object			Object
      * @param string		$action			Actions
      * @param HookManager	$hookmanager	Hook manager
-     * @return void
+     * @return int
      */
     public function printCommonFooter($parameters, &$object, &$action, $hookmanager)
     {

From ab1b5cfab50e5b46f4a26d97580956b3dea60c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 16 Dec 2019 20:30:24 +0100
Subject: [PATCH 3/4] The variable $i seems to be never defined.

---
 htdocs/ticket/class/api_tickets.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index c95b092cf2e..707fe403c6c 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -291,6 +291,7 @@ class Tickets extends DolibarrApi
         $result = $db->query($sql);
         if ($result) {
             $num = $db->num_rows($result);
+            $i = 0;
             while ($i < $num) {
                 $obj = $db->fetch_object($result);
                 $ticket_static = new Ticket($db);

From 404ae0c20988e9fc7d9318d758456bbc26469d9a Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Tue, 17 Dec 2019 02:00:52 +0000
Subject: [PATCH 4/4] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 htdocs/accountancy/customer/lines.php         |   2 +-
 htdocs/accountancy/expensereport/lines.php    | 132 +--
 htdocs/accountancy/supplier/lines.php         |   2 +-
 .../core/class/html.formaccounting.class.php  |  94 +-
 htdocs/cron/class/cronjob.class.php           | 820 +++++++++---------
 htdocs/public/ticket/create_ticket.php        |  80 +-
 htdocs/societe/class/societeaccount.class.php |  84 +-
 htdocs/theme/eldy/badges.inc.php              |  38 +-
 htdocs/theme/eldy/theme_vars.inc.php          |  10 +-
 htdocs/theme/md/badges.inc.php                |  40 +-
 htdocs/theme/md/theme_vars.inc.php            |   8 +-
 11 files changed, 655 insertions(+), 655 deletions(-)

diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 4a20d6e3764..6a9ba9d84f2 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "compta", "accountancy", "productbatch"));
 
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index f77ee12071d..1bedd8b871d 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -26,17 +26,17 @@
  */
 require '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta","bills","other","accountancy","trips","productbatch"));
+$langs->loadLangs(array("compta", "bills", "other", "accountancy", "trips", "productbatch"));
 
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $account_parent = GETPOST('account_parent', 'int');
 $changeaccount = GETPOST('changeaccount');
@@ -47,12 +47,12 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day=GETPOST("search_day", "int");
-$search_month=GETPOST("search_month", "int");
-$search_year=GETPOST("search_year", "int");
+$search_day = GETPOST("search_day", "int");
+$search_month = GETPOST("search_month", "int");
+$search_year = GETPOST("search_year", "int");
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
@@ -60,9 +60,9 @@ if (empty($page) || $page < 0) $page = 0;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 $offset = $limit * $page;
-if (! $sortfield)
+if (!$sortfield)
 	$sortfield = "erd.date, erd.rowid";
-if (! $sortorder) {
+if (!$sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
 		$sortorder = "DESC";
 	}
@@ -71,7 +71,7 @@ if (! $sortorder) {
 // Security check
 if ($user->socid > 0)
 	accessforbidden();
-if (! $user->rights->accounting->bind->write)
+if (!$user->rights->accounting->bind->write)
 	accessforbidden();
 
 $formaccounting = new FormAccounting($db);
@@ -98,27 +98,27 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
 
-	if (! (GETPOST('account_parent', 'int') >= 0))
+	if (!(GETPOST('account_parent', 'int') >= 0))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->begin();
 
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd";
-		$sql1 .= " SET erd.fk_code_ventilation=" . (GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
-		$sql1 .= ' WHERE erd.rowid IN (' . implode(',', $changeaccount) . ')';
+		$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det as erd";
+		$sql1 .= " SET erd.fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
+		$sql1 .= ' WHERE erd.rowid IN ('.implode(',', $changeaccount).')';
 
-		dol_syslog('accountancy/expensereport/lines.php::changeaccount sql= ' . $sql1);
+		dol_syslog('accountancy/expensereport/lines.php::changeaccount sql= '.$sql1);
 		$resql1 = $db->query($sql1);
-		if (! $resql1) {
-			$error ++;
+		if (!$resql1) {
+			$error++;
 			setEventMessages($db->lasterror(), null, 'errors');
 		}
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 			setEventMessages($langs->trans('Save'), null, 'mesgs');
 		} else {
@@ -126,7 +126,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 			setEventMessages($db->lasterror(), null, 'errors');
 		}
 
-		$account_parent = '';   // Protection to avoid to mass apply it a second time
+		$account_parent = ''; // Protection to avoid to mass apply it a second time
 	}
 }
 
@@ -138,7 +138,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) {
 $form = new Form($db);
 $formother = new FormOther($db);
 
-llxHeader('', $langs->trans("ExpenseReportsVentilation") . ' - ' . $langs->trans("Dispatched"));
+llxHeader('', $langs->trans("ExpenseReportsVentilation").' - '.$langs->trans("Dispatched"));
 
 print '<script type="text/javascript">
 			$(function () {
@@ -164,10 +164,10 @@ $sql = "SELECT er.ref, er.rowid as erid,";
 $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht, erd.fk_code_ventilation, erd.tva_tx, erd.vat_src_code, erd.date,";
 $sql .= " aa.label, aa.account_number,";
 $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label";
-$sql .= " FROM " . MAIN_DB_PREFIX . "expensereport as er";
-$sql .= " , " . MAIN_DB_PREFIX . "accounting_account as aa";
-$sql .= " , " . MAIN_DB_PREFIX . "expensereport_det as erd";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
+$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
+$sql .= " , ".MAIN_DB_PREFIX."accounting_account as aa";
+$sql .= " , ".MAIN_DB_PREFIX."expensereport_det as erd";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as f ON f.id = erd.fk_c_type_fees";
 $sql .= " WHERE er.rowid = erd.fk_expensereport and er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <> 0 ";
 $sql .= " AND aa.rowid = erd.fk_code_ventilation";
 if (strlen(trim($search_expensereport))) {
@@ -188,8 +188,8 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("erd.tva_tx", price2num($search_vat), 1);
 }
-$sql.=dolSqlDateFilter('erd.date', $search_day, $search_month, $search_year);
-$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
+$sql .= dolSqlDateFilter('erd.date', $search_day, $search_month, $search_year);
+$sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -215,19 +215,19 @@ if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
 
-	$param='';
-	if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-	if ($search_expensereport) $param .= "&search_expensereport=" . urlencode($search_expensereport);
-	if ($search_label)		$param .= "&search_label=" . urlencode($search_label);
-	if ($search_desc)		$param .= "&search_desc=" . urlencode($search_desc);
-	if ($search_account)	$param .= "&search_account=" . urlencode($search_account);
-	if ($search_vat)		$param .= "&search_vat=" . urlencode($search_vat);
+	$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_expensereport) $param .= "&search_expensereport=".urlencode($search_expensereport);
+	if ($search_label)		$param .= "&search_label=".urlencode($search_label);
+	if ($search_desc)		$param .= "&search_desc=".urlencode($search_desc);
+	if ($search_account)	$param .= "&search_account=".urlencode($search_account);
+	if ($search_vat)		$param .= "&search_vat=".urlencode($search_vat);
 	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
 	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
 	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
 
-	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -238,33 +238,33 @@ if ($result) {
 
 	print_barre_liste($langs->trans("ExpenseReportLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
-	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneExpenseReport") . '</span><br>';
+	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneExpenseReport").'</span><br>';
 
-	print '<br><div class="inline-block divButAction">' . $langs->trans("ChangeAccount") . '<br>';
+	print '<br><div class="inline-block divButAction">'.$langs->trans("ChangeAccount").'<br>';
 	print $formaccounting->select_account($account_parent, 'account_parent', 2, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone valignmiddle');
-	print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("ChangeBinding") . '" /></div>';
+	print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("ChangeBinding").'" /></div>';
 
 	$moreforfilter = '';
 
     print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"></td>';
-	print '<td><input type="text" class="flat maxwidth50" name="search_expensereport" value="' . dol_escape_htmltag($search_expensereport) . '"></td>';
+	print '<td><input type="text" class="flat maxwidth50" name="search_expensereport" value="'.dol_escape_htmltag($search_expensereport).'"></td>';
 	print '<td class="liste_titre center">';
-   	if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
+   	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
    	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
    	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="' . dol_escape_htmltag($search_desc) . '"></td>';
-	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50" name="search_amount" value="' . dol_escape_htmltag($search_amount) . '"></td>';
-	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" placeholder="%" value="' . dol_escape_htmltag($search_vat) . '"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="' . dol_escape_htmltag($search_account) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
+	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
+	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" placeholder="%" value="'.dol_escape_htmltag($search_vat).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
     print '<td class="liste_titre right"></td>';
     print '<td class="liste_titre right">';
-    $searchpicto=$form->showFilterButtons();
+    $searchpicto = $form->showFilterButtons();
     print $searchpicto;
     print '</td>';
 	print "</tr>\n";
@@ -279,29 +279,29 @@ if ($result) {
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre('');
-    $checkpicto=$form->showCheckAddButtons();
+    $checkpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
 	$expensereport_static = new ExpenseReport($db);
 
-	while ( $i < min($num_lines, $limit) ) {
+	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
-		$codeCompta = length_accountg($objp->account_number) . ' - ' . $objp->label;
+		$codeCompta = length_accountg($objp->account_number).' - '.$objp->label;
 
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 
 		print '<tr class="oddeven">';
 
-		print '<td>' . $objp->rowid . '</td>';
+		print '<td>'.$objp->rowid.'</td>';
 
 		// Ref Invoice
-		print '<td>' . $expensereport_static->getNomUrl(1) . '</td>';
+		print '<td>'.$expensereport_static->getNomUrl(1).'</td>';
 
-		print '<td class="center">' . dol_print_date($db->jdate($objp->date), 'day') . '</td>';
+		print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>';
 
-		print '<td class="tdoverflow">' . ($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))) . '</td>';
+		print '<td class="tdoverflow">'.($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))).'</td>';
 
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments));
@@ -309,20 +309,20 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
 
-		print '<td class="nowrap right">' . price($objp->total_ht) . '</td>';
+		print '<td class="nowrap right">'.price($objp->total_ht).'</td>';
 
-		print '<td class="center">' . vatrate($objp->tva_tx.($objp->vat_src_code?' ('.$objp->vat_src_code.')':'')) . '</td>';
+		print '<td class="center">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
-		print '<td>' . $codeCompta . '</td>';
+		print '<td>'.$codeCompta.'</td>';
 
-		print '<td class="left"><a href="./card.php?id=' . $objp->rowid . '&backtopage='.urlencode($_SERVER["PHP_SELF"].($param?'?'.$param:'')). '">';
+		print '<td class="left"><a href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
 
-		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="' . $objp->rowid . '"/></td>';
+		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';
 
 		print "</tr>";
-		$i ++;
+		$i++;
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index e3079fa1dad..60d0665c530 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "accountancy", "productbatch"));
 
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $account_parent = GETPOST('account_parent');
 $changeaccount = GETPOST('changeaccount');
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 5757b87ceb9..c26a9cd7108 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -24,7 +24,7 @@
  *  \ingroup    Accountancy (Double entries)
  *	\brief      File of class with all html predefined components
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -43,7 +43,7 @@ class FormAccounting extends Form
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     /**
 	 * Constructor
@@ -73,26 +73,26 @@ class FormAccounting extends Form
 	public function select_journal($selectid, $htmlname = 'journal', $nature = 0, $showempty = 0, $select_in = 0, $select_out = 0, $morecss = 'maxwidth300 maxwidthonsmartphone', $usecache = '', $disabledajaxcombo = 0)
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$out = '';
 
     	$options = array();
-		if ($usecache && ! empty($this->options_cache[$usecache]))
+		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
 		    $options = $this->options_cache[$usecache];
-		    $selected=$selectid;
+		    $selected = $selectid;
 		}
 		else
 		{
 			$sql = "SELECT rowid, code, label, nature, entity, active";
-			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
-			$sql.= " WHERE active = 1";
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+			$sql .= " WHERE active = 1";
+			$sql .= " AND entity = ".$conf->entity;
 			if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
-			$sql.= " ORDER BY code";
+			$sql .= " ORDER BY code";
 
-			dol_syslog(get_class($this) . "::select_journal", LOG_DEBUG);
+			dol_syslog(get_class($this)."::select_journal", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 
 			if (!$resql) {
@@ -105,7 +105,7 @@ class FormAccounting extends Form
 			$langs->load('accountancy');
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$label = $obj->code . ' - ' . $langs->trans($obj->label);
+				$label = $obj->code.' - '.$langs->trans($obj->label);
 
     			$select_value_in = $obj->rowid;
 				$select_value_out = $obj->rowid;
@@ -133,7 +133,7 @@ class FormAccounting extends Form
 			}
 		}
 
-		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo?0:1));
+		$out .= Form::selectarray($htmlname, $options, $selected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, ($disabledajaxcombo ? 0 : 1));
 
 		return $out;
 	}
@@ -154,7 +154,7 @@ class FormAccounting extends Form
     public function select_accounting_category($selected = '', $htmlname = 'account_category', $useempty = 0, $maxlen = 0, $help = 1, $allcountries = 0)
     {
         // phpcs:enable
-        global $db,$langs,$user,$mysoc;
+        global $db, $langs, $user, $mysoc;
 
         if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))
         {
@@ -162,28 +162,28 @@ class FormAccounting extends Form
             exit;
         }
 
-        if (! empty($mysoc->country_id))
+        if (!empty($mysoc->country_id))
         {
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
-            $sql.= " WHERE c.active = 1";
-			$sql.= " AND c.category_type = 0";
-            if (empty($allcountries)) $sql.= " AND c.fk_country = ".$mysoc->country_id;
-            $sql.= " ORDER BY c.label ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
+            $sql .= " WHERE c.active = 1";
+			$sql .= " AND c.category_type = 0";
+            if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
+            $sql .= " ORDER BY c.label ASC";
         }
         else
         {
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql.= " WHERE c.active = 1";
-			$sql.= " AND c.category_type = 0";
-			$sql.= " AND c.fk_country = co.rowid";
-            if (empty($allcountries)) $sql.= " AND co.code = '".$mysoc->country_code."'";
-            $sql.= " ORDER BY c.label ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
+            $sql .= " WHERE c.active = 1";
+			$sql .= " AND c.category_type = 0";
+			$sql .= " AND c.fk_country = co.rowid";
+            if (empty($allcountries)) $sql .= " AND co.code = '".$mysoc->country_code."'";
+            $sql .= " ORDER BY c.label ASC";
         }
 
         dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $num = $db->num_rows($resql);
@@ -192,7 +192,7 @@ class FormAccounting extends Form
                 $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) $out.= '<option value="0">&nbsp;</option>';
+                if ($useempty) $out .= '<option value="0">&nbsp;</option>';
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
@@ -202,7 +202,7 @@ class FormAccounting extends Form
 					$out .= ' ('.$obj->range_account.')';
                     $i++;
                 }
-                $out .=  '</select>';
+                $out .= '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
             }
             else
@@ -233,17 +233,17 @@ class FormAccounting extends Form
         // phpcs:enable
 		$options = array();
 
-		$sql = 'SELECT DISTINCT import_key from ' . MAIN_DB_PREFIX . 'accounting_bookkeeping';
+		$sql = 'SELECT DISTINCT import_key from '.MAIN_DB_PREFIX.'accounting_bookkeeping';
 	    $sql .= " WHERE entity IN (".getEntity('accountancy').")";
 		$sql .= ' ORDER BY import_key DESC';
 
-		dol_syslog(get_class($this) . "::select_bookkeeping_importkey", LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_bookkeeping_importkey", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if (!$resql) {
-			$this->error = "Error " . $this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_bookkeeping_importkey " . $this->error, LOG_ERR);
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::select_bookkeeping_importkey ".$this->error, LOG_ERR);
+			return -1;
 		}
 
 		while ($obj = $this->db->fetch_object($resql)) {
@@ -272,7 +272,7 @@ class FormAccounting extends Form
         // phpcs:enable
 		global $conf, $langs;
 
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 		$out = '';
 
@@ -283,36 +283,36 @@ class FormAccounting extends Form
     		$options['0'] = '--- '.$langs->trans("None").' ---';
     	}
 
-		if ($usecache && ! empty($this->options_cache[$usecache]))
+		if ($usecache && !empty($this->options_cache[$usecache]))
 		{
-		    $options = $options + $this->options_cache[$usecache];		// We use + instead of array_merge because we don't want to reindex key from 0
-		    $selected=$selectid;
+		    $options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
+		    $selected = $selectid;
 		}
 		else
 		{
     		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 
     		$sql = "SELECT DISTINCT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version";
-    		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
-    		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
-    		$sql .= " AND asy.rowid = " . $conf->global->CHARTOFACCOUNTS;
+    		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
+    		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
+    		$sql .= " AND asy.rowid = ".$conf->global->CHARTOFACCOUNTS;
     		$sql .= " AND aa.active = 1";
     		$sql .= " AND aa.entity=".$conf->entity;
     		$sql .= " ORDER BY aa.account_number";
 
-    		dol_syslog(get_class($this) . "::select_account", LOG_DEBUG);
+    		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
     		$resql = $this->db->query($sql);
 
     		if (!$resql) {
-    			$this->error = "Error " . $this->db->lasterror();
-    			dol_syslog(get_class($this) . "::select_account " . $this->error, LOG_ERR);
+    			$this->error = "Error ".$this->db->lasterror();
+    			dol_syslog(get_class($this)."::select_account ".$this->error, LOG_ERR);
     			return -1;
     		}
 
     		$selected = 0;
     		while ($obj = $this->db->fetch_object($resql))
     		{
-    			$label = length_accountg($obj->account_number) . ' - ' . $obj->label;
+    			$label = length_accountg($obj->account_number).' - '.$obj->label;
     			$label = dol_trunc($label, $trunclength);
 
     			$select_value_in = $obj->rowid;
@@ -367,7 +367,7 @@ class FormAccounting extends Form
 		// Auxiliary customer account
 		$sql = "SELECT DISTINCT code_compta, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-	    $sql .= " WHERE entity IN (" . getEntity('societe') . ")";
+	    $sql .= " WHERE entity IN (".getEntity('societe').")";
 		$sql .= " ORDER BY code_compta";
 
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
@@ -388,7 +388,7 @@ class FormAccounting extends Form
 		// Auxiliary supplier account
 		$sql = "SELECT DISTINCT code_compta_fournisseur, nom ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
-		$sql .= " WHERE entity IN (" . getEntity('societe') . ")";
+		$sql .= " WHERE entity IN (".getEntity('societe').")";
 		$sql .= " ORDER BY code_compta_fournisseur";
 		dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -408,7 +408,7 @@ class FormAccounting extends Form
         // Auxiliary user account
         $sql = "SELECT DISTINCT accountancy_code, lastname, firstname ";
         $sql .= " FROM ".MAIN_DB_PREFIX."user";
-        $sql .= " WHERE entity IN (" . getEntity('user') . ")";
+        $sql .= " WHERE entity IN (".getEntity('user').")";
         $sql .= " ORDER BY accountancy_code";
         dol_syslog(get_class($this)."::select_auxaccount", LOG_DEBUG);
         $resql = $this->db->query($sql);
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index f645244e40a..b70707f1464 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -33,12 +33,12 @@ class Cronjob extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='cronjob';
+	public $element = 'cronjob';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='cronjob';
+	public $table_element = 'cronjob';
 
     /**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -51,8 +51,8 @@ class Cronjob extends CommonObject
 	public $entity;
 
     public $jobtype;
-	public $tms='';
-	public $datec='';
+	public $tms = '';
+	public $datec = '';
 
 	/**
      * @var string Cron Job label
@@ -70,14 +70,14 @@ class Cronjob extends CommonObject
 	/**
 	 * @var string|int     Date for last job execution
 	 */
-	public $datelastrun='';
+	public $datelastrun = '';
 	/**
 	 * @var string|int     Date for next job execution
 	 */
-	public $datenextrun='';
-	public $dateend='';
-	public $datestart='';
-	public $datelastresult='';
+	public $datenextrun = '';
+	public $dateend = '';
+	public $datestart = '';
+	public $datelastresult = '';
 	public $lastresult;
 	public $lastoutput;
 	public $unitfrequency;
@@ -102,7 +102,7 @@ class Cronjob extends CommonObject
 
 	public $nbrun;
 	public $libname;
-	public $test;					// A test condition to know if job is visible/qualified
+	public $test; // A test condition to know if job is visible/qualified
 
 	const STATUS_DISABLED = 0;
 	const STATUS_ENABLED = 1;
@@ -130,141 +130,141 @@ class Cronjob extends CommonObject
     public function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Clean parameters
 
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->jobtype)) $this->jobtype=trim($this->jobtype);
-		if (isset($this->command)) $this->command=trim($this->command);
-		if (isset($this->classesname)) $this->classesname=trim($this->classesname);
-		if (isset($this->objectname)) $this->objectname=trim($this->objectname);
-		if (isset($this->methodename)) $this->methodename=trim($this->methodename);
-		if (isset($this->params)) $this->params=trim($this->params);
-		if (isset($this->md5params)) $this->md5params=trim($this->md5params);
-		if (isset($this->module_name)) $this->module_name=trim($this->module_name);
-		if (isset($this->priority)) $this->priority=trim($this->priority);
-		if (isset($this->lastoutput)) $this->lastoutput=trim($this->lastoutput);
-		if (isset($this->lastresult)) $this->lastresult=trim($this->lastresult);
-		if (isset($this->unitfrequency)) $this->unitfrequency=trim($this->unitfrequency);
-		if (isset($this->frequency)) $this->frequency=trim($this->frequency);
-		if (isset($this->status)) $this->status=trim($this->status);
-		if (isset($this->note)) $this->note=trim($this->note);
-		if (isset($this->nbrun)) $this->nbrun=trim($this->nbrun);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->jobtype)) $this->jobtype = trim($this->jobtype);
+		if (isset($this->command)) $this->command = trim($this->command);
+		if (isset($this->classesname)) $this->classesname = trim($this->classesname);
+		if (isset($this->objectname)) $this->objectname = trim($this->objectname);
+		if (isset($this->methodename)) $this->methodename = trim($this->methodename);
+		if (isset($this->params)) $this->params = trim($this->params);
+		if (isset($this->md5params)) $this->md5params = trim($this->md5params);
+		if (isset($this->module_name)) $this->module_name = trim($this->module_name);
+		if (isset($this->priority)) $this->priority = trim($this->priority);
+		if (isset($this->lastoutput)) $this->lastoutput = trim($this->lastoutput);
+		if (isset($this->lastresult)) $this->lastresult = trim($this->lastresult);
+		if (isset($this->unitfrequency)) $this->unitfrequency = trim($this->unitfrequency);
+		if (isset($this->frequency)) $this->frequency = trim($this->frequency);
+		if (isset($this->status)) $this->status = trim($this->status);
+		if (isset($this->note)) $this->note = trim($this->note);
+		if (isset($this->nbrun)) $this->nbrun = trim($this->nbrun);
 		if (isset($this->libname)) $this->libname = trim($this->libname);
 		if (isset($this->test)) $this->test = trim($this->test);
 
 		// Check parameters
 		// Put here code to add a control on parameters values
-		if (dol_strlen($this->datestart)==0) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronDtStart'));
+		if (dol_strlen($this->datestart) == 0) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronDtStart'));
 			$error++;
 		}
 		if (empty($this->label)) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronLabel'));
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronLabel'));
 			$error++;
 		}
-		if ((dol_strlen($this->datestart)!=0) && (dol_strlen($this->dateend)!=0) && ($this->dateend<$this->datestart)) {
-			$this->errors[]=$langs->trans('CronErrEndDateStartDt');
+		if ((dol_strlen($this->datestart) != 0) && (dol_strlen($this->dateend) != 0) && ($this->dateend < $this->datestart)) {
+			$this->errors[] = $langs->trans('CronErrEndDateStartDt');
 			$error++;
 		}
 		if (empty($this->unitfrequency)) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronFrequency'));
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronFrequency'));
 			$error++;
 		}
-		if (($this->jobtype=='command') && (empty($this->command))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronCommand'));
+		if (($this->jobtype == 'command') && (empty($this->command))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronCommand'));
 			$error++;
 		}
-		if (($this->jobtype=='method') && (empty($this->classesname))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronClass'));
+		if (($this->jobtype == 'method') && (empty($this->classesname))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronClass'));
 			$error++;
 		}
-		if (($this->jobtype=='method' || $this->jobtype == 'function') && (empty($this->methodename))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronMethod'));
+		if (($this->jobtype == 'method' || $this->jobtype == 'function') && (empty($this->methodename))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronMethod'));
 			$error++;
 		}
-		if (($this->jobtype=='method') && (empty($this->objectname))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronObject'));
+		if (($this->jobtype == 'method') && (empty($this->objectname))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronObject'));
 			$error++;
 		}
-		if (($this->jobtype=='function') && (empty($this->libname))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronLib'));
+		if (($this->jobtype == 'function') && (empty($this->libname))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronLib'));
 			$error++;
 		}
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob(";
-		$sql.= "entity,";
-		$sql.= "datec,";
-		$sql.= "jobtype,";
-		$sql.= "label,";
-		$sql.= "command,";
-		$sql.= "classesname,";
-		$sql.= "objectname,";
-		$sql.= "methodename,";
-		$sql.= "params,";
-		$sql.= "md5params,";
-		$sql.= "module_name,";
-		$sql.= "priority,";
-		$sql.= "datelastrun,";
-		$sql.= "datenextrun,";
-		$sql.= "dateend,";
-		$sql.= "datestart,";
-		$sql.= "lastresult,";
-		$sql.= "datelastresult,";
-		$sql.= "lastoutput,";
-		$sql.= "unitfrequency,";
-		$sql.= "frequency,";
-		$sql.= "status,";
-		$sql.= "fk_user_author,";
-		$sql.= "fk_user_mod,";
-		$sql.= "note,";
-		$sql.= "nbrun,";
-		$sql.= "maxrun,";
-		$sql.= "libname,";
-		$sql.= "test";
-		$sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->entity)?$conf->entity:$this->db->escape($this->entity)).",";
-		$sql.= " '".$this->db->idate($now)."',";
-		$sql.= " ".(! isset($this->jobtype)?'NULL':"'".$this->db->escape($this->jobtype)."'").",";
-		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
-		$sql.= " ".(! isset($this->command)?'NULL':"'".$this->db->escape($this->command)."'").",";
-		$sql.= " ".(! isset($this->classesname)?'NULL':"'".$this->db->escape($this->classesname)."'").",";
-		$sql.= " ".(! isset($this->objectname)?'NULL':"'".$this->db->escape($this->objectname)."'").",";
-		$sql.= " ".(! isset($this->methodename)?'NULL':"'".$this->db->escape($this->methodename)."'").",";
-		$sql.= " ".(! isset($this->params)?'NULL':"'".$this->db->escape($this->params)."'").",";
-		$sql.= " ".(! isset($this->md5params)?'NULL':"'".$this->db->escape($this->md5params)."'").",";
-		$sql.= " ".(! isset($this->module_name)?'NULL':"'".$this->db->escape($this->module_name)."'").",";
-		$sql.= " ".(! isset($this->priority)?'0':$this->priority).",";
-		$sql.= " ".(! isset($this->datelastrun) || dol_strlen($this->datelastrun)==0?'NULL':"'".$this->db->idate($this->datelastrun)."'").",";
-		$sql.= " ".(! isset($this->datenextrun) || dol_strlen($this->datenextrun)==0?'NULL':"'".$this->db->idate($this->datenextrun)."'").",";
-		$sql.= " ".(! isset($this->dateend) || dol_strlen($this->dateend)==0?'NULL':"'".$this->db->idate($this->dateend)."'").",";
-		$sql.= " ".(! isset($this->datestart) || dol_strlen($this->datestart)==0?'NULL':"'".$this->db->idate($this->datestart)."'").",";
-		$sql.= " ".(! isset($this->lastresult)?'NULL':"'".$this->db->escape($this->lastresult)."'").",";
-		$sql.= " ".(! isset($this->datelastresult) || dol_strlen($this->datelastresult)==0?'NULL':"'".$this->db->idate($this->datelastresult)."'").",";
-		$sql.= " ".(! isset($this->lastoutput)?'NULL':"'".$this->db->escape($this->lastoutput)."'").",";
-		$sql.= " ".(! isset($this->unitfrequency)?'NULL':"'".$this->db->escape($this->unitfrequency)."'").",";
-		$sql.= " ".(! isset($this->frequency)?'0':$this->frequency).",";
-		$sql.= " ".(! isset($this->status)?'0':$this->status).",";
-		$sql.= " ".$user->id.",";
-		$sql.= " ".$user->id.",";
-		$sql.= " ".(! isset($this->note)?'NULL':"'".$this->db->escape($this->note)."'").",";
-		$sql.= " ".(! isset($this->nbrun)?'0':$this->db->escape($this->nbrun)).",";
-		$sql.= " ".(empty($this->maxrun)?'0':$this->db->escape($this->maxrun)).",";
-		$sql.= " ".(! isset($this->libname)?'NULL':"'".$this->db->escape($this->libname)."'").",";
-		$sql.= " ".(! isset($this->test)?'NULL':"'".$this->db->escape($this->test)."'")."";
-		$sql.= ")";
+		$sql .= "entity,";
+		$sql .= "datec,";
+		$sql .= "jobtype,";
+		$sql .= "label,";
+		$sql .= "command,";
+		$sql .= "classesname,";
+		$sql .= "objectname,";
+		$sql .= "methodename,";
+		$sql .= "params,";
+		$sql .= "md5params,";
+		$sql .= "module_name,";
+		$sql .= "priority,";
+		$sql .= "datelastrun,";
+		$sql .= "datenextrun,";
+		$sql .= "dateend,";
+		$sql .= "datestart,";
+		$sql .= "lastresult,";
+		$sql .= "datelastresult,";
+		$sql .= "lastoutput,";
+		$sql .= "unitfrequency,";
+		$sql .= "frequency,";
+		$sql .= "status,";
+		$sql .= "fk_user_author,";
+		$sql .= "fk_user_mod,";
+		$sql .= "note,";
+		$sql .= "nbrun,";
+		$sql .= "maxrun,";
+		$sql .= "libname,";
+		$sql .= "test";
+		$sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->entity) ? $conf->entity : $this->db->escape($this->entity)).",";
+		$sql .= " '".$this->db->idate($now)."',";
+		$sql .= " ".(!isset($this->jobtype) ? 'NULL' : "'".$this->db->escape($this->jobtype)."'").",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
+		$sql .= " ".(!isset($this->command) ? 'NULL' : "'".$this->db->escape($this->command)."'").",";
+		$sql .= " ".(!isset($this->classesname) ? 'NULL' : "'".$this->db->escape($this->classesname)."'").",";
+		$sql .= " ".(!isset($this->objectname) ? 'NULL' : "'".$this->db->escape($this->objectname)."'").",";
+		$sql .= " ".(!isset($this->methodename) ? 'NULL' : "'".$this->db->escape($this->methodename)."'").",";
+		$sql .= " ".(!isset($this->params) ? 'NULL' : "'".$this->db->escape($this->params)."'").",";
+		$sql .= " ".(!isset($this->md5params) ? 'NULL' : "'".$this->db->escape($this->md5params)."'").",";
+		$sql .= " ".(!isset($this->module_name) ? 'NULL' : "'".$this->db->escape($this->module_name)."'").",";
+		$sql .= " ".(!isset($this->priority) ? '0' : $this->priority).",";
+		$sql .= " ".(!isset($this->datelastrun) || dol_strlen($this->datelastrun) == 0 ? 'NULL' : "'".$this->db->idate($this->datelastrun)."'").",";
+		$sql .= " ".(!isset($this->datenextrun) || dol_strlen($this->datenextrun) == 0 ? 'NULL' : "'".$this->db->idate($this->datenextrun)."'").",";
+		$sql .= " ".(!isset($this->dateend) || dol_strlen($this->dateend) == 0 ? 'NULL' : "'".$this->db->idate($this->dateend)."'").",";
+		$sql .= " ".(!isset($this->datestart) || dol_strlen($this->datestart) == 0 ? 'NULL' : "'".$this->db->idate($this->datestart)."'").",";
+		$sql .= " ".(!isset($this->lastresult) ? 'NULL' : "'".$this->db->escape($this->lastresult)."'").",";
+		$sql .= " ".(!isset($this->datelastresult) || dol_strlen($this->datelastresult) == 0 ? 'NULL' : "'".$this->db->idate($this->datelastresult)."'").",";
+		$sql .= " ".(!isset($this->lastoutput) ? 'NULL' : "'".$this->db->escape($this->lastoutput)."'").",";
+		$sql .= " ".(!isset($this->unitfrequency) ? 'NULL' : "'".$this->db->escape($this->unitfrequency)."'").",";
+		$sql .= " ".(!isset($this->frequency) ? '0' : $this->frequency).",";
+		$sql .= " ".(!isset($this->status) ? '0' : $this->status).",";
+		$sql .= " ".$user->id.",";
+		$sql .= " ".$user->id.",";
+		$sql .= " ".(!isset($this->note) ? 'NULL' : "'".$this->db->escape($this->note)."'").",";
+		$sql .= " ".(!isset($this->nbrun) ? '0' : $this->db->escape($this->nbrun)).",";
+		$sql .= " ".(empty($this->maxrun) ? '0' : $this->db->escape($this->maxrun)).",";
+		$sql .= " ".(!isset($this->libname) ? 'NULL' : "'".$this->db->escape($this->libname)."'").",";
+		$sql .= " ".(!isset($this->test) ? 'NULL' : "'".$this->db->escape($this->test)."'")."";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."cronjob");
 
@@ -285,13 +285,13 @@ class Cronjob extends CommonObject
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -310,50 +310,50 @@ class Cronjob extends CommonObject
     public function fetch($id)
     {
         $sql = "SELECT";
-        $sql.= " t.rowid,";
-        $sql.= " t.entity,";
-		$sql.= " t.tms,";
-		$sql.= " t.datec,";
-		$sql.= " t.jobtype,";
-		$sql.= " t.label,";
-		$sql.= " t.command,";
-		$sql.= " t.classesname,";
-		$sql.= " t.objectname,";
-		$sql.= " t.methodename,";
-		$sql.= " t.params,";
-		$sql.= " t.md5params,";
-		$sql.= " t.module_name,";
-		$sql.= " t.priority,";
-		$sql.= " t.datelastrun,";
-		$sql.= " t.datenextrun,";
-		$sql.= " t.dateend,";
-		$sql.= " t.datestart,";
-		$sql.= " t.lastresult,";
-		$sql.= " t.datelastresult,";
-		$sql.= " t.lastoutput,";
-		$sql.= " t.unitfrequency,";
-		$sql.= " t.frequency,";
-		$sql.= " t.status,";
-		$sql.= " t.processing,";
-		$sql.= " t.fk_user_author,";
-		$sql.= " t.fk_user_mod,";
-		$sql.= " t.note,";
-		$sql.= " t.nbrun,";
-		$sql.= " t.maxrun,";
-		$sql.= " t.libname,";
-		$sql.= " t.test";
-        $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
-        $sql.= " WHERE t.rowid = ".$id;
+        $sql .= " t.rowid,";
+        $sql .= " t.entity,";
+		$sql .= " t.tms,";
+		$sql .= " t.datec,";
+		$sql .= " t.jobtype,";
+		$sql .= " t.label,";
+		$sql .= " t.command,";
+		$sql .= " t.classesname,";
+		$sql .= " t.objectname,";
+		$sql .= " t.methodename,";
+		$sql .= " t.params,";
+		$sql .= " t.md5params,";
+		$sql .= " t.module_name,";
+		$sql .= " t.priority,";
+		$sql .= " t.datelastrun,";
+		$sql .= " t.datenextrun,";
+		$sql .= " t.dateend,";
+		$sql .= " t.datestart,";
+		$sql .= " t.lastresult,";
+		$sql .= " t.datelastresult,";
+		$sql .= " t.lastoutput,";
+		$sql .= " t.unitfrequency,";
+		$sql .= " t.frequency,";
+		$sql .= " t.status,";
+		$sql .= " t.processing,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.fk_user_mod,";
+		$sql .= " t.note,";
+		$sql .= " t.nbrun,";
+		$sql .= " t.maxrun,";
+		$sql .= " t.libname,";
+		$sql .= " t.test";
+        $sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
+        $sql .= " WHERE t.rowid = ".$id;
 
     	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->id = $obj->rowid;
                 $this->ref = $obj->rowid;
 				$this->entity = $obj->entity;
 				$this->tms = $this->db->jdate($obj->tms);
@@ -393,7 +393,7 @@ class Cronjob extends CommonObject
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -416,71 +416,71 @@ class Cronjob extends CommonObject
         // phpcs:enable
         global $langs;
 
-    	$this->lines=array();
+    	$this->lines = array();
 
     	$sql = "SELECT";
-    	$sql.= " t.rowid,";
-    	$sql.= " t.entity,";
-    	$sql.= " t.tms,";
-    	$sql.= " t.datec,";
-    	$sql.= " t.jobtype,";
-    	$sql.= " t.label,";
-    	$sql.= " t.command,";
-    	$sql.= " t.classesname,";
-    	$sql.= " t.objectname,";
-    	$sql.= " t.methodename,";
-    	$sql.= " t.params,";
-    	$sql.= " t.md5params,";
-    	$sql.= " t.module_name,";
-    	$sql.= " t.priority,";
-    	$sql.= " t.datelastrun,";
-    	$sql.= " t.datenextrun,";
-    	$sql.= " t.dateend,";
-    	$sql.= " t.datestart,";
-    	$sql.= " t.lastresult,";
-    	$sql.= " t.datelastresult,";
-    	$sql.= " t.lastoutput,";
-    	$sql.= " t.unitfrequency,";
-    	$sql.= " t.frequency,";
-    	$sql.= " t.status,";
-    	$sql.= " t.processing,";
-    	$sql.= " t.fk_user_author,";
-    	$sql.= " t.fk_user_mod,";
-    	$sql.= " t.note,";
-    	$sql.= " t.nbrun,";
-    	$sql.= " t.libname,";
-    	$sql.= " t.test";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
-    	$sql.= " WHERE 1 = 1";
-    	if ($processing >= 0) $sql.= " AND t.processing = ".(empty($processing)?'0':'1');
-    	if ($status >= 0 && $status < 2) $sql.= " AND t.status = ".(empty($status)?'0':'1');
-    	elseif ($status == 2) $sql.= " AND t.status = 2";
+    	$sql .= " t.rowid,";
+    	$sql .= " t.entity,";
+    	$sql .= " t.tms,";
+    	$sql .= " t.datec,";
+    	$sql .= " t.jobtype,";
+    	$sql .= " t.label,";
+    	$sql .= " t.command,";
+    	$sql .= " t.classesname,";
+    	$sql .= " t.objectname,";
+    	$sql .= " t.methodename,";
+    	$sql .= " t.params,";
+    	$sql .= " t.md5params,";
+    	$sql .= " t.module_name,";
+    	$sql .= " t.priority,";
+    	$sql .= " t.datelastrun,";
+    	$sql .= " t.datenextrun,";
+    	$sql .= " t.dateend,";
+    	$sql .= " t.datestart,";
+    	$sql .= " t.lastresult,";
+    	$sql .= " t.datelastresult,";
+    	$sql .= " t.lastoutput,";
+    	$sql .= " t.unitfrequency,";
+    	$sql .= " t.frequency,";
+    	$sql .= " t.status,";
+    	$sql .= " t.processing,";
+    	$sql .= " t.fk_user_author,";
+    	$sql .= " t.fk_user_mod,";
+    	$sql .= " t.note,";
+    	$sql .= " t.nbrun,";
+    	$sql .= " t.libname,";
+    	$sql .= " t.test";
+    	$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
+    	$sql .= " WHERE 1 = 1";
+    	if ($processing >= 0) $sql .= " AND t.processing = ".(empty($processing) ? '0' : '1');
+    	if ($status >= 0 && $status < 2) $sql .= " AND t.status = ".(empty($status) ? '0' : '1');
+    	elseif ($status == 2) $sql .= " AND t.status = 2";
     	//Manage filter
-    	if (is_array($filter) && count($filter)>0) {
-    		foreach($filter as $key => $value)
+    	if (is_array($filter) && count($filter) > 0) {
+    		foreach ($filter as $key => $value)
     		{
-    		    if ($key == 't.rowid') $sql.= ' AND '.$key.' = '.$this->db->escape($value);
-   				else $sql.= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+    		    if ($key == 't.rowid') $sql .= ' AND '.$key.' = '.$this->db->escape($value);
+   				else $sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
     		}
     	}
 
-    	$sql.= $this->db->order($sortfield, $sortorder);
+    	$sql .= $this->db->order($sortfield, $sortorder);
     	if (!empty($limit) && !empty($offset)) {
-    		$sql.= $this->db->plimit($limit + 1, $offset);
+    		$sql .= $this->db->plimit($limit + 1, $offset);
     	}
 
     	$sqlwhere = array();
 
-    	if (count($sqlwhere)>0) {
-    		$sql.= " WHERE ".implode(' AND ', $sqlwhere);
+    	if (count($sqlwhere) > 0) {
+    		$sql .= " WHERE ".implode(' AND ', $sqlwhere);
     	}
 
     	dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
-    	$resql=$this->db->query($sql);
+    	$resql = $this->db->query($sql);
     	if ($resql)
     	{
-    		$num=$this->db->num_rows($resql);
-    		$i=0;
+    		$num = $this->db->num_rows($resql);
+    		$i = 0;
 
     		if ($num)
     		{
@@ -490,7 +490,7 @@ class Cronjob extends CommonObject
 
 	    			$obj = $this->db->fetch_object($resql);
 
-	    			$line->id    = $obj->rowid;
+	    			$line->id = $obj->rowid;
 	    			$line->ref = $obj->rowid;
 	    			$line->entity = $obj->entity;
 	    			$line->tms = $this->db->jdate($obj->tms);
@@ -522,7 +522,7 @@ class Cronjob extends CommonObject
 	    			$line->nbrun = $obj->nbrun;
 	    			$line->libname = $obj->libname;
 	    			$line->test = $obj->test;
-	    			$this->lines[]=$line;
+	    			$this->lines[] = $line;
 
 	    			$i++;
 	    		}
@@ -533,7 +533,7 @@ class Cronjob extends CommonObject
     	}
     	else
     	{
-    		$this->error="Error ".$this->db->lasterror();
+    		$this->error = "Error ".$this->db->lasterror();
     		return -1;
     	}
     }
@@ -552,110 +552,110 @@ class Cronjob extends CommonObject
 
     	$langs->load('cron');
 
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->jobtype)) $this->jobtype=trim($this->jobtype);
-		if (isset($this->command)) $this->command=trim($this->command);
-		if (isset($this->classesname)) $this->classesname=trim($this->classesname);
-		if (isset($this->objectname)) $this->objectname=trim($this->objectname);
-		if (isset($this->methodename)) $this->methodename=trim($this->methodename);
-		if (isset($this->params)) $this->params=trim($this->params);
-		if (isset($this->md5params)) $this->md5params=trim($this->md5params);
-		if (isset($this->module_name)) $this->module_name=trim($this->module_name);
-		if (isset($this->priority)) $this->priority=trim($this->priority);
-		if (isset($this->lastoutput)) $this->lastoutput=trim($this->lastoutput);
-		if (isset($this->lastresult)) $this->lastresult=trim($this->lastresult);
-		if (isset($this->unitfrequency)) $this->unitfrequency=trim($this->unitfrequency);
-		if (isset($this->frequency)) $this->frequency=trim($this->frequency);
-		if (isset($this->status)) $this->status=trim($this->status);
-		if (isset($this->note)) $this->note=trim($this->note);
-		if (isset($this->nbrun)) $this->nbrun=trim($this->nbrun);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->jobtype)) $this->jobtype = trim($this->jobtype);
+		if (isset($this->command)) $this->command = trim($this->command);
+		if (isset($this->classesname)) $this->classesname = trim($this->classesname);
+		if (isset($this->objectname)) $this->objectname = trim($this->objectname);
+		if (isset($this->methodename)) $this->methodename = trim($this->methodename);
+		if (isset($this->params)) $this->params = trim($this->params);
+		if (isset($this->md5params)) $this->md5params = trim($this->md5params);
+		if (isset($this->module_name)) $this->module_name = trim($this->module_name);
+		if (isset($this->priority)) $this->priority = trim($this->priority);
+		if (isset($this->lastoutput)) $this->lastoutput = trim($this->lastoutput);
+		if (isset($this->lastresult)) $this->lastresult = trim($this->lastresult);
+		if (isset($this->unitfrequency)) $this->unitfrequency = trim($this->unitfrequency);
+		if (isset($this->frequency)) $this->frequency = trim($this->frequency);
+		if (isset($this->status)) $this->status = trim($this->status);
+		if (isset($this->note)) $this->note = trim($this->note);
+		if (isset($this->nbrun)) $this->nbrun = trim($this->nbrun);
         if (isset($this->libname)) $this->libname = trim($this->libname);
         if (isset($this->test)) $this->test = trim($this->test);
 
-		if (empty($this->maxrun)) $this->maxrun=0;
-        if (empty($this->processing)) $this->processing=0;
+		if (empty($this->maxrun)) $this->maxrun = 0;
+        if (empty($this->processing)) $this->processing = 0;
 
 		// Check parameters
 		// Put here code to add a control on parameters values
-		if (dol_strlen($this->datestart)==0) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronDtStart'));
+		if (dol_strlen($this->datestart) == 0) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronDtStart'));
 			$error++;
 		}
-		if ((dol_strlen($this->datestart)!=0) && (dol_strlen($this->dateend)!=0) && ($this->dateend<$this->datestart)) {
-			$this->errors[]=$langs->trans('CronErrEndDateStartDt');
+		if ((dol_strlen($this->datestart) != 0) && (dol_strlen($this->dateend) != 0) && ($this->dateend < $this->datestart)) {
+			$this->errors[] = $langs->trans('CronErrEndDateStartDt');
 			$error++;
 		}
 		if (empty($this->label)) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronLabel'));
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronLabel'));
 			$error++;
 		}
 		if (empty($this->unitfrequency)) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronFrequency'));
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronFrequency'));
 			$error++;
 		}
-		if (($this->jobtype=='command') && (empty($this->command))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronCommand'));
+		if (($this->jobtype == 'command') && (empty($this->command))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronCommand'));
 			$error++;
 		}
-		if (($this->jobtype=='method') && (empty($this->classesname))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronClass'));
+		if (($this->jobtype == 'method') && (empty($this->classesname))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronClass'));
 			$error++;
 		}
-		if (($this->jobtype=='method' || $this->jobtype == 'function') && (empty($this->methodename))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronMethod'));
+		if (($this->jobtype == 'method' || $this->jobtype == 'function') && (empty($this->methodename))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronMethod'));
 			$error++;
 		}
-		if (($this->jobtype=='method') && (empty($this->objectname))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronObject'));
+		if (($this->jobtype == 'method') && (empty($this->objectname))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronObject'));
 			$error++;
 		}
 
-		if (($this->jobtype=='function') && (empty($this->libname))) {
-			$this->errors[]=$langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronLib'));
+		if (($this->jobtype == 'function') && (empty($this->libname))) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronLib'));
 			$error++;
 		}
 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."cronjob SET";
-        $sql.= " entity=".(isset($this->entity)?$this->db->escape($this->entity):$conf->entity).",";
-		$sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
-		$sql.= " jobtype=".(isset($this->jobtype)?"'".$this->db->escape($this->jobtype)."'":"null").",";
-		$sql.= " command=".(isset($this->command)?"'".$this->db->escape($this->command)."'":"null").",";
-		$sql.= " classesname=".(isset($this->classesname)?"'".$this->db->escape($this->classesname)."'":"null").",";
-		$sql.= " objectname=".(isset($this->objectname)?"'".$this->db->escape($this->objectname)."'":"null").",";
-		$sql.= " methodename=".(isset($this->methodename)?"'".$this->db->escape($this->methodename)."'":"null").",";
-		$sql.= " params=".(isset($this->params)?"'".$this->db->escape($this->params)."'":"null").",";
-		$sql.= " md5params=".(isset($this->md5params)?"'".$this->db->escape($this->md5params)."'":"null").",";
-		$sql.= " module_name=".(isset($this->module_name)?"'".$this->db->escape($this->module_name)."'":"null").",";
-		$sql.= " priority=".(isset($this->priority)?$this->priority:"null").",";
-		$sql.= " datelastrun=".(dol_strlen($this->datelastrun)!=0 ? "'".$this->db->idate($this->datelastrun)."'" : 'null').",";
-		$sql.= " datenextrun=".(dol_strlen($this->datenextrun)!=0 ? "'".$this->db->idate($this->datenextrun)."'" : 'null').",";
-		$sql.= " dateend=".(dol_strlen($this->dateend)!=0 ? "'".$this->db->idate($this->dateend)."'" : 'null').",";
-		$sql.= " datestart=".(dol_strlen($this->datestart)!=0 ? "'".$this->db->idate($this->datestart)."'" : 'null').",";
-		$sql.= " datelastresult=".(dol_strlen($this->datelastresult)!=0 ? "'".$this->db->idate($this->datelastresult)."'" : 'null').",";
-		$sql.= " lastresult=".(isset($this->lastresult)?"'".$this->db->escape($this->lastresult)."'":"null").",";
-		$sql.= " lastoutput=".(isset($this->lastoutput)?"'".$this->db->escape($this->lastoutput)."'":"null").",";
-		$sql.= " unitfrequency=".(isset($this->unitfrequency)?$this->unitfrequency:"null").",";
-		$sql.= " frequency=".(isset($this->frequency)?$this->frequency:"null").",";
-		$sql.= " status=".(isset($this->status)?$this->status:"null").",";
-		$sql.= " processing=".((isset($this->processing) && $this->processing > 0)?$this->processing:"0").",";
-		$sql.= " fk_user_mod=".$user->id.",";
-		$sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").",";
-		$sql.= " nbrun=".((isset($this->nbrun) && $this->nbrun >0)?$this->nbrun:"null").",";
-		$sql.= " maxrun=".((isset($this->maxrun) && $this->maxrun > 0)?$this->maxrun:"0").",";
-		$sql.= " libname=".(isset($this->libname)?"'".$this->db->escape($this->libname)."'":"null").",";
-		$sql.= " test=".(isset($this->test)?"'".$this->db->escape($this->test)."'":"null");
-		$sql.= " WHERE rowid=".$this->id;
+        $sql .= " entity=".(isset($this->entity) ? $this->db->escape($this->entity) : $conf->entity).",";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " jobtype=".(isset($this->jobtype) ? "'".$this->db->escape($this->jobtype)."'" : "null").",";
+		$sql .= " command=".(isset($this->command) ? "'".$this->db->escape($this->command)."'" : "null").",";
+		$sql .= " classesname=".(isset($this->classesname) ? "'".$this->db->escape($this->classesname)."'" : "null").",";
+		$sql .= " objectname=".(isset($this->objectname) ? "'".$this->db->escape($this->objectname)."'" : "null").",";
+		$sql .= " methodename=".(isset($this->methodename) ? "'".$this->db->escape($this->methodename)."'" : "null").",";
+		$sql .= " params=".(isset($this->params) ? "'".$this->db->escape($this->params)."'" : "null").",";
+		$sql .= " md5params=".(isset($this->md5params) ? "'".$this->db->escape($this->md5params)."'" : "null").",";
+		$sql .= " module_name=".(isset($this->module_name) ? "'".$this->db->escape($this->module_name)."'" : "null").",";
+		$sql .= " priority=".(isset($this->priority) ? $this->priority : "null").",";
+		$sql .= " datelastrun=".(dol_strlen($this->datelastrun) != 0 ? "'".$this->db->idate($this->datelastrun)."'" : 'null').",";
+		$sql .= " datenextrun=".(dol_strlen($this->datenextrun) != 0 ? "'".$this->db->idate($this->datenextrun)."'" : 'null').",";
+		$sql .= " dateend=".(dol_strlen($this->dateend) != 0 ? "'".$this->db->idate($this->dateend)."'" : 'null').",";
+		$sql .= " datestart=".(dol_strlen($this->datestart) != 0 ? "'".$this->db->idate($this->datestart)."'" : 'null').",";
+		$sql .= " datelastresult=".(dol_strlen($this->datelastresult) != 0 ? "'".$this->db->idate($this->datelastresult)."'" : 'null').",";
+		$sql .= " lastresult=".(isset($this->lastresult) ? "'".$this->db->escape($this->lastresult)."'" : "null").",";
+		$sql .= " lastoutput=".(isset($this->lastoutput) ? "'".$this->db->escape($this->lastoutput)."'" : "null").",";
+		$sql .= " unitfrequency=".(isset($this->unitfrequency) ? $this->unitfrequency : "null").",";
+		$sql .= " frequency=".(isset($this->frequency) ? $this->frequency : "null").",";
+		$sql .= " status=".(isset($this->status) ? $this->status : "null").",";
+		$sql .= " processing=".((isset($this->processing) && $this->processing > 0) ? $this->processing : "0").",";
+		$sql .= " fk_user_mod=".$user->id.",";
+		$sql .= " note=".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : "null").",";
+		$sql .= " nbrun=".((isset($this->nbrun) && $this->nbrun > 0) ? $this->nbrun : "null").",";
+		$sql .= " maxrun=".((isset($this->maxrun) && $this->maxrun > 0) ? $this->maxrun : "0").",";
+		$sql .= " libname=".(isset($this->libname) ? "'".$this->db->escape($this->libname)."'" : "null").",";
+		$sql .= " test=".(isset($this->test) ? "'".$this->db->escape($this->test)."'" : "null");
+		$sql .= " WHERE rowid=".$this->id;
 
         $this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		//if (! $error && ! $notrigger)
 		//{
@@ -673,13 +673,13 @@ class Cronjob extends CommonObject
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -698,30 +698,30 @@ class Cronjob extends CommonObject
 	 */
     public function delete($user, $notrigger = 0)
 	{
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
     	$sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
-    	$sql.= " WHERE rowid=".$this->id;
+    	$sql .= " WHERE rowid=".$this->id;
 
     	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
     	$resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
-            $this->errors[]="Error ".$this->db->lasterror();
+            $this->errors[] = "Error ".$this->db->lasterror();
         }
 
         // 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
 		{
@@ -741,28 +741,28 @@ class Cronjob extends CommonObject
 	 */
 	public function createFromClone(User $user, $fromid)
 	{
-		$error=0;
+		$error = 0;
 
-		$object=new Cronjob($this->db);
+		$object = new Cronjob($this->db);
 
 		$this->db->begin();
 
 		// Load source object
 		$object->fetch($fromid);
-		$object->id=0;
-		$object->statut=0;
+		$object->id = 0;
+		$object->statut = 0;
 
 		// Clear fields
 		// ...
 
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
-		$result=$object->create($user);
+		$result = $object->create($user);
 
 		// Other options
 		if ($result < 0)
 		{
-			$this->error=$object->error;
+			$this->error = $object->error;
 			$error++;
 		}
 
@@ -774,7 +774,7 @@ class Cronjob extends CommonObject
 		unset($object->context['createfromclone']);
 
 		// End
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return $object->id;
@@ -795,37 +795,37 @@ class Cronjob extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-		$this->id=0;
-		$this->ref=0;
-		$this->entity=0;
-		$this->tms='';
-		$this->datec='';
-		$this->label='';
-		$this->jobtype='';
-		$this->command='';
-		$this->classesname='';
-		$this->objectname='';
-		$this->methodename='';
-		$this->params='';
-		$this->md5params='';
-		$this->module_name='';
-		$this->priority='';
-		$this->datelastrun='';
-		$this->datenextrun='';
-		$this->dateend='';
-		$this->datestart='';
-		$this->datelastresult='';
-		$this->lastoutput='';
-		$this->lastresult='';
-		$this->unitfrequency='';
-		$this->frequency='';
-		$this->status=0;
-		$this->processing=0;
-		$this->fk_user_author=0;
-		$this->fk_user_mod=0;
-		$this->note='';
-		$this->nbrun='';
-		$this->maxrun=100;
+		$this->id = 0;
+		$this->ref = 0;
+		$this->entity = 0;
+		$this->tms = '';
+		$this->datec = '';
+		$this->label = '';
+		$this->jobtype = '';
+		$this->command = '';
+		$this->classesname = '';
+		$this->objectname = '';
+		$this->methodename = '';
+		$this->params = '';
+		$this->md5params = '';
+		$this->module_name = '';
+		$this->priority = '';
+		$this->datelastrun = '';
+		$this->datenextrun = '';
+		$this->dateend = '';
+		$this->datestart = '';
+		$this->datelastresult = '';
+		$this->lastoutput = '';
+		$this->lastresult = '';
+		$this->unitfrequency = '';
+		$this->frequency = '';
+		$this->status = 0;
+		$this->processing = 0;
+		$this->fk_user_author = 0;
+		$this->fk_user_mod = 0;
+		$this->note = '';
+		$this->nbrun = '';
+		$this->maxrun = 100;
         $this->libname = '';
 	}
 
@@ -846,44 +846,44 @@ class Cronjob extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
 
-		$label = '<u>' . $langs->trans("CronJob") . '</u>';
-		$label.= '<br>';
-		$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		$label = '<u>'.$langs->trans("CronJob").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		$url = DOL_URL_ROOT.'/cron/card.php?id='.$this->id;
 
 		if ($option != 'nolink')
 		{
 			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			$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))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label=$langs->trans("ShowCronJob");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowCronJob");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 		}
-		else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -900,12 +900,12 @@ class Cronjob extends CommonObject
 	public function info($id)
 	{
 		$sql = "SELECT";
-		$sql.= " f.rowid, f.datec, f.tms, f.fk_user_mod, f.fk_user_author";
-		$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as f";
-		$sql.= " WHERE f.rowid = ".$id;
+		$sql .= " f.rowid, f.datec, f.tms, f.fk_user_mod, f.fk_user_author";
+		$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as f";
+		$sql .= " WHERE f.rowid = ".$id;
 
 		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))
@@ -923,7 +923,7 @@ class Cronjob extends CommonObject
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -945,7 +945,7 @@ class Cronjob extends CommonObject
 
 		$hookmanager->initHooks(array('cron'));
 
-		$now=dol_now();
+		$now = dol_now();
 		$error = 0;
 		$retval = '';
 
@@ -953,7 +953,7 @@ class Cronjob extends CommonObject
 
 		if (empty($userlogin))
 		{
-			$this->error="User login is mandatory";
+			$this->error = "User login is mandatory";
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -969,11 +969,11 @@ class Cronjob extends CommonObject
 		dol_syslog(get_class($this)."::run_jobs entity for running job is ".$conf->entity);
 
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-		$user=new User($this->db);
-		$result=$user->fetch('', $userlogin);
-		if ($result<0)
+		$user = new User($this->db);
+		$result = $user->fetch('', $userlogin);
+		if ($result < 0)
 		{
-			$this->error="User Error:".$user->error;
+			$this->error = "User Error:".$user->error;
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 			$conf->entity = $savcurrententity;
 			return -1;
@@ -982,7 +982,7 @@ class Cronjob extends CommonObject
 		{
 			if (empty($user->id))
 			{
-				$this->error=" User user login:".$userlogin." do not exists";
+				$this->error = " User user login:".$userlogin." do not exists";
 				dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 				$conf->entity = $savcurrententity;
 				return -1;
@@ -992,13 +992,13 @@ class Cronjob extends CommonObject
 		dol_syslog(get_class($this)."::run_jobs jobtype=".$this->jobtype." userlogin=".$userlogin, LOG_DEBUG);
 
 		// Increase limit of time. Works only if we are not in safe mode
-		$ExecTimeLimit=600;
+		$ExecTimeLimit = 600;
 		if (!empty($ExecTimeLimit))
 		{
-			$err=error_reporting();
-			error_reporting(0);     // Disable all errors
+			$err = error_reporting();
+			error_reporting(0); // Disable all errors
 			//error_reporting(E_ALL);
-			@set_time_limit($ExecTimeLimit);   // Need more than 240 on Windows 7/64
+			@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
 			error_reporting($err);
 		}
 		if (!empty($MemoryLimit))
@@ -1007,30 +1007,30 @@ class Cronjob extends CommonObject
 		}
 
 		// Update last run date start (to track running jobs)
-		$this->datelastrun=$now;
-		$this->datelastresult=null;
-		$this->lastoutput='';
-		$this->lastresult='';
-		$this->processing = 1;                // To know job was started
-		$this->nbrun=$this->nbrun + 1;
-		$result = $this->update($user);       // This include begin/commit
-		if ($result<0) {
+		$this->datelastrun = $now;
+		$this->datelastresult = null;
+		$this->lastoutput = '';
+		$this->lastresult = '';
+		$this->processing = 1; // To know job was started
+		$this->nbrun = $this->nbrun + 1;
+		$result = $this->update($user); // This include begin/commit
+		if ($result < 0) {
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 			$conf->entity = $savcurrententity;
 			return -1;
 		}
 
 		// Run a method
-		if ($this->jobtype=='method')
+		if ($this->jobtype == 'method')
 		{
 			// load classes
-			if (! $error)
+			if (!$error)
 			{
-				$ret=dol_include_once($this->classesname);
-				if ($ret===false || (! class_exists($this->objectname)))
+				$ret = dol_include_once($this->classesname);
+				if ($ret === false || (!class_exists($this->objectname)))
 				{
-					if ($ret===false) $this->error=$langs->trans('CronCannotLoadClass', $this->classesname, $this->objectname);
-					else $this->error=$langs->trans('CronCannotLoadObject', $this->classesname, $this->objectname);
+					if ($ret === false) $this->error = $langs->trans('CronCannotLoadClass', $this->classesname, $this->objectname);
+					else $this->error = $langs->trans('CronCannotLoadObject', $this->classesname, $this->objectname);
 					dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 					$this->lastoutput = $this->error;
 					$this->lastresult = -1;
@@ -1040,11 +1040,11 @@ class Cronjob extends CommonObject
 			}
 
 			// test if method exists
-			if (! $error)
+			if (!$error)
 			{
-			    if (! method_exists($this->objectname, $this->methodename))
+			    if (!method_exists($this->objectname, $this->methodename))
 			    {
-			        $this->error=$langs->trans('CronMethodDoesNotExists', $this->objectname, $this->methodename);
+			        $this->error = $langs->trans('CronMethodDoesNotExists', $this->objectname, $this->methodename);
     				dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
     				$this->lastoutput = $this->error;
     				$this->lastresult = -1;
@@ -1054,10 +1054,10 @@ class Cronjob extends CommonObject
 			}
 
 			// Load langs
-			if (! $error)
+			if (!$error)
 			{
-				$result=$langs->load($this->module_name);
-				$result=$langs->load($this->module_name.'@'.$this->module_name);	// If this->module_name was an existing language file, this will make nothing
+				$result = $langs->load($this->module_name);
+				$result = $langs->load($this->module_name.'@'.$this->module_name); // If this->module_name was an existing language file, this will make nothing
 				if ($result < 0)	// If technical error
 				{
 					dol_syslog(get_class($this)."::run_jobs Cannot load module lang file - ".$langs->error, LOG_ERR);
@@ -1069,13 +1069,13 @@ class Cronjob extends CommonObject
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				dol_syslog(get_class($this)."::run_jobs START ".$this->objectname."->".$this->methodename."(".$this->params.");", LOG_DEBUG);
 
 				// Create Object for the called module
 				$object = new $this->objectname($this->db);
-				if ($this->entity > 0) $object->entity = $this->entity;		// We work on a dedicated entity
+				if ($this->entity > 0) $object->entity = $this->entity; // We work on a dedicated entity
 
 				$params_arr = array_map('trim', explode(",", $this->params));
 
@@ -1088,28 +1088,28 @@ class Cronjob extends CommonObject
 					$result = call_user_func_array(array($object, $this->methodename), $params_arr);
 				}
 
-				if ($result === false || (! is_bool($result) && $result != 0))
+				if ($result === false || (!is_bool($result) && $result != 0))
 				{
 				    $langs->load("errors");
 
-				    $errmsg='';
-				    if (! is_array($object->errors) || ! in_array($object->error, $object->errors)) $errmsg.=$object->error;
-				    if (is_array($object->errors) && count($object->errors)) $errmsg.=($errmsg?', '.$errmsg:'').join(', ', $object->errors);
-				    if (empty($errmsg)) $errmsg=$langs->trans('ErrorUnknown');
+				    $errmsg = '';
+				    if (!is_array($object->errors) || !in_array($object->error, $object->errors)) $errmsg .= $object->error;
+				    if (is_array($object->errors) && count($object->errors)) $errmsg .= ($errmsg ? ', '.$errmsg : '').join(', ', $object->errors);
+				    if (empty($errmsg)) $errmsg = $langs->trans('ErrorUnknown');
 
 				    dol_syslog(get_class($this)."::run_jobs END result=".$result." error=".$errmsg, LOG_ERR);
 
 				    $this->error = $errmsg;
-				    $this->lastoutput = ($object->output?$object->output."\n":"").$errmsg;
-					$this->lastresult = is_numeric($result)?$result:-1;
+				    $this->lastoutput = ($object->output ? $object->output."\n" : "").$errmsg;
+					$this->lastresult = is_numeric($result) ? $result : -1;
 		            $retval = $this->lastresult;
 		            $error++;
 				}
 				else
 				{
 					dol_syslog(get_class($this)."::run_jobs END");
-				    $this->lastoutput=$object->output;
-					$this->lastresult=var_export($result, true);
+				    $this->lastoutput = $object->output;
+					$this->lastresult = var_export($result, true);
 					$retval = $this->lastresult;
 				}
 			}
@@ -1117,27 +1117,27 @@ class Cronjob extends CommonObject
 
 		if ($this->jobtype == 'function') {
 			//load lib
-			$libpath = '/' . strtolower($this->module_name) . '/lib/' . $this->libname;
+			$libpath = '/'.strtolower($this->module_name).'/lib/'.$this->libname;
 			$ret = dol_include_once($libpath);
 			if ($ret === false)
 			{
-				$this->error = $langs->trans('CronCannotLoadLib') . ': ' . $libpath;
-				dol_syslog(get_class($this) . "::run_jobs " . $this->error, LOG_ERR);
+				$this->error = $langs->trans('CronCannotLoadLib').': '.$libpath;
+				dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 				$conf->entity = $savcurrententity;
 				return -1;
 			}
 
 			// Load langs
-			$result=$langs->load($this->module_name);
-			$result=$langs->load($this->module_name.'@'.$this->module_name);	// If this->module_name was an existing language file, this will make nothing
+			$result = $langs->load($this->module_name);
+			$result = $langs->load($this->module_name.'@'.$this->module_name); // If this->module_name was an existing language file, this will make nothing
 			if ($result < 0)	// If technical error
 			{
-				dol_syslog(get_class($this) . "::run_jobs Cannot load module langs" . $langs->error, LOG_ERR);
+				dol_syslog(get_class($this)."::run_jobs Cannot load module langs".$langs->error, LOG_ERR);
 				$conf->entity = $savcurrententity;
 				return -1;
 			}
 
-			dol_syslog(get_class($this) . "::run_jobs " . $this->libname . "::" . $this->methodename."(" . $this->params . ");", LOG_DEBUG);
+			dol_syslog(get_class($this)."::run_jobs ".$this->libname."::".$this->methodename."(".$this->params.");", LOG_DEBUG);
 			$params_arr = explode(", ", $this->params);
 			if (!is_array($params_arr))
 			{
@@ -1148,34 +1148,34 @@ class Cronjob extends CommonObject
 				$result = call_user_func_array($this->methodename, $params_arr);
 			}
 
-			if ($result === false || (! is_bool($result) && $result != 0))
+			if ($result === false || (!is_bool($result) && $result != 0))
 			{
 			    $langs->load("errors");
 			    dol_syslog(get_class($this)."::run_jobs result=".$result, LOG_ERR);
 			    $this->error = $langs->trans('ErrorUnknown');
 			    $this->lastoutput = $this->error;
-			    $this->lastresult = is_numeric($result)?$result:-1;
+			    $this->lastresult = is_numeric($result) ? $result : -1;
 			    $retval = $this->lastresult;
 			    $error++;
 			}
 			else
 			{
-                $this->lastoutput=var_export($result, true);
-                $this->lastresult=var_export($result, true);	// Return code
+                $this->lastoutput = var_export($result, true);
+                $this->lastresult = var_export($result, true); // Return code
                 $retval = $this->lastresult;
 			}
 		}
 
 		// Run a command line
-		if ($this->jobtype=='command')
+		if ($this->jobtype == 'command')
 		{
 			$outputdir = $conf->cron->dir_temp;
 			if (empty($outputdir)) $outputdir = $conf->cronjob->dir_temp;
 
-			if (! empty($outputdir))
+			if (!empty($outputdir))
 			{
 				dol_mkdir($outputdir);
-				$outputfile=$outputdir.'/cronjob.'.$userlogin.'.out';	// File used with popen method
+				$outputfile = $outputdir.'/cronjob.'.$userlogin.'.out'; // File used with popen method
 
 				// Execute a CLI
 				include_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
@@ -1191,9 +1191,9 @@ class Cronjob extends CommonObject
 
 		dol_syslog(get_class($this)."::run_jobs now we update job to track it is finished (with success or error)");
 
-		$this->datelastresult=dol_now();
-		$this->processing=0;
-		$result = $this->update($user);       // This include begin/commit
+		$this->datelastresult = dol_now();
+		$this->processing = 0;
+		$result = $this->update($user); // This include begin/commit
 		if ($result < 0)
 		{
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
@@ -1202,7 +1202,7 @@ class Cronjob extends CommonObject
 		}
 
 		$conf->entity = $savcurrententity;
-		return $error?-1:1;
+		return $error ?-1 : 1;
 	}
 
 
@@ -1220,11 +1220,11 @@ class Cronjob extends CommonObject
 		dol_syslog(get_class($this)."::reprogram_jobs userlogin:$userlogin", LOG_DEBUG);
 
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-		$user=new User($this->db);
-		$result=$user->fetch('', $userlogin);
-		if ($result<0)
+		$user = new User($this->db);
+		$result = $user->fetch('', $userlogin);
+		if ($result < 0)
 		{
-			$this->error="User Error : ".$user->error;
+			$this->error = "User Error : ".$user->error;
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -1232,7 +1232,7 @@ class Cronjob extends CommonObject
 		{
 			if (empty($user->id))
 			{
-				$this->error=" User user login:".$userlogin." do not exists";
+				$this->error = " User user login:".$userlogin." do not exists";
 				dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 				return -1;
 			}
@@ -1275,7 +1275,7 @@ class Cronjob extends CommonObject
 		}
 
 		$result = $this->update($user);
-		if ($result<0)
+		if ($result < 0)
 		{
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
@@ -1313,7 +1313,7 @@ class Cronjob extends CommonObject
 			$langs->load('users');
 
 			$moretext = '';
-			if ($processing) $moretext=' ('.$langs->trans("Running").')';
+			if ($processing) $moretext = ' ('.$langs->trans("Running").')';
 
 			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Draft').$moretext;
 			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled').$moretext;
@@ -1346,8 +1346,8 @@ class Cronjobline
 	 */
 	public $ref;
 
-	public $tms='';
-	public $datec='';
+	public $tms = '';
+	public $datec = '';
 
 	/**
      * @var string Cron Job Line label
@@ -1363,11 +1363,11 @@ class Cronjobline
 	public $md5params;
 	public $module_name;
 	public $priority;
-	public $datelastrun='';
-	public $datenextrun='';
-	public $dateend='';
-	public $datestart='';
-	public $lastresult='';
+	public $datelastrun = '';
+	public $datenextrun = '';
+	public $dateend = '';
+	public $datestart = '';
+	public $lastresult = '';
 	public $lastoutput;
 	public $unitfrequency;
 	public $frequency;
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index def832bae14..b69d28f0cb0 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -26,7 +26,7 @@ if (!defined('NOREQUIREUSER'))  define('NOREQUIREUSER', '1');
 if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
 if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOLOGIN'))        define("NOLOGIN", 1);     // This means this output page does not require to be logged.
+if (!defined('NOLOGIN'))        define("NOLOGIN", 1); // This means this output page does not require to be logged.
 if (!defined('NOCSRFCHECK'))    define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 require '../../main.inc.php';
@@ -58,15 +58,15 @@ $extrafields->fetch_name_optionals_label($object->table_element);
  */
 
 // Add file in email form
-if (GETPOST('addfile', 'alpha') && ! GETPOST('add', 'alpha')) {
+if (GETPOST('addfile', 'alpha') && !GETPOST('add', 'alpha')) {
     ////$res = $object->fetch('','',GETPOST('track_id'));
     ////if($res > 0)
     ////{
-    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
     // Set tmp directory TODO Use a dedicated directory for temp mails files
     $vardir = $conf->ticket->dir_output;
-    $upload_dir_tmp = $vardir . '/temp';
+    $upload_dir_tmp = $vardir.'/temp';
     if (!dol_is_dir($upload_dir_tmp)) {
         dol_mkdir($upload_dir_tmp);
     }
@@ -77,11 +77,11 @@ if (GETPOST('addfile', 'alpha') && ! GETPOST('add', 'alpha')) {
 
 // Remove file
 if (GETPOST('removedfile', 'alpha') && !GETPOST('add', 'alpha')) {
-    include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
     // Set tmp directory
-    $vardir = $conf->ticket->dir_output . '/';
-    $upload_dir_tmp = $vardir . '/temp';
+    $vardir = $conf->ticket->dir_output.'/';
+    $upload_dir_tmp = $vardir.'/temp';
 
     // TODO Delete only files that was uploaded from email form
     dol_remove_file_process($_POST['removedfile'], 0, 0);
@@ -156,7 +156,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
             $user = new User($db);
         }
 
-        $object->context['disableticketemail']=1;		// Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
+        $object->context['disableticketemail'] = 1; // Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
 
         $id = $object->create($user);
         if ($id <= 0) {
@@ -172,7 +172,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
         	$object->db->commit();
         	$action = "infos_success";
@@ -182,13 +182,13 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 	    	$action = 'create_ticket';
 	    }
 
-	    if (! $error)
+	    if (!$error)
 	    {
             $res = $object->fetch($id);
             if ($res) {
                 // Create form object
-                include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-                include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+                include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
                 $formmail = new FormMail($db);
 
                 // Init to avoid errors
@@ -203,20 +203,20 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 
                 // Send email to customer
 
-                $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketNewEmailSubject');
-                $message .= ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')) . "\n\n";
-                $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket') . "\n";
+                $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject');
+                $message .= ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody'))."\n\n";
+                $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket')."\n";
 
-                $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE . '/' : dol_buildpath('/public/ticket/view.php', 2)) . '?track_id=' . $object->track_id;
-                $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="' . $url_public_ticket . '">' . $object->track_id . '</a>') . "\n";
-                $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl') . "\n\n";
+                $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+                $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'">'.$object->track_id.'</a>')."\n";
+                $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl')."\n\n";
 
                 $message .= dol_nl2br($infos_new_ticket);
                 $message .= $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE ? $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE : $langs->transnoentities('TicketMessageMailSignatureText');
 
                 $sendto = GETPOST('email', 'alpha');
 
-                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKET_NOTIFICATION_EMAIL_FROM . '>';
+                $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
                 $replyto = $from;
 				$sendtocc = '';
 				$deliveryreceipt = 0;
@@ -227,7 +227,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
                     $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
                     $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
                 }
-                include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+                include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
                 $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
                 if ($mailfile->error || $mailfile->errors) {
                     setEventMessages($mailfile->error, $mailfile->errors, 'errors');
@@ -245,17 +245,17 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 
                 if ($sendto)
                 {
-	                $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketNewEmailSubjectAdmin');
-	                $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id) . "\n\n";
-	                $message_admin .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
-	                $message_admin .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
-	                $message_admin .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
-	                $message_admin .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
-	                $message_admin .= '<li>' . $langs->trans('From') . ' : ' . $object->origin_email . '</li>';
+	                $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
+	                $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
+	                $message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+	                $message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+	                $message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+	                $message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+	                $message_admin .= '<li>'.$langs->trans('From').' : '.$object->origin_email.'</li>';
 
 	                if (is_array($extrafields->attributes[$object->table_element]['label']))
 	                {
-	                	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	                	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	                	{
 	                		$enabled = 1;
 	                		if ($qualified && isset($extrafields->attributes[$object->table_element]['list'][$key]))
@@ -268,18 +268,18 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 	                			$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);
 	                		}
 
-	                		$qualified=true;
+	                		$qualified = true;
 	                		if (empty($enabled) || $enabled == 2) $qualified = false;
 	                		if (empty($perms)) $qualified = false;
-	                		if ($qualified) $message_admin .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+	                		if ($qualified) $message_admin .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 	                	}
 	                }
 
 	                $message_admin .= '</ul>';
-	                $message_admin .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
-	                $message_admin .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
+	                $message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+	                $message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
-	                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKET_NOTIFICATION_EMAIL_FROM . '>';
+	                $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 	                $replyto = $from;
 
 	                $message_admin = dol_nl2br($message_admin);
@@ -288,7 +288,7 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 	                    $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 	                }
-	                include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+	                include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	                $mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
 	                if ($mailfile->error || $mailfile->errors) {
                         setEventMessages($mailfile->error, $mailfile->errors, 'errors');
@@ -302,19 +302,19 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
             }
 
             // Copy files into ticket directory
-            $destdir = $conf->ticket->dir_output . '/' . $object->track_id;
-            if (! dol_is_dir($destdir)) {
+            $destdir = $conf->ticket->dir_output.'/'.$object->track_id;
+            if (!dol_is_dir($destdir)) {
             	dol_mkdir($destdir);
             }
             foreach ($filename as $i => $val) {
-            	dol_move($filepath[$i], $destdir . '/' . $filename[$i], 0, 1);
+            	dol_move($filepath[$i], $destdir.'/'.$filename[$i], 0, 1);
             	$formmail->remove_attached_files($i);
             }
 
             //setEventMessages($langs->trans('YourTicketSuccessfullySaved'), null, 'mesgs');
 
             // Make a redirect to avoid to have ticket submitted twice if we make back
-            setEventMessages($langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '<strong>' . $object->track_id . '</strong>'), null, 'warnings');
+            setEventMessages($langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '<strong>'.$object->track_id.'</strong>'), null, 'warnings');
             setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
             header("Location: index.php");
 			exit;
@@ -335,7 +335,7 @@ $formticket = new FormTicket($db);
 
 if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)
 {
-    print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
+    print '<div class="error">'.$langs->trans('TicketPublicInterfaceForbidden').'</div>';
     $db->close();
     exit();
 }
@@ -371,7 +371,7 @@ if ($action != "infos_success") {
     	print '<div>';
     }
     else {
-	    print '<div class="info marginleftonly marginrightonly">' . $langs->trans('TicketPublicInfoCreateTicket') . '</div>';
+	    print '<div class="info marginleftonly marginrightonly">'.$langs->trans('TicketPublicInfoCreateTicket').'</div>';
     	$formticket->showForm();
     }
 }
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index d6b9ef35acf..f90cb17c230 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -25,7 +25,7 @@
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -76,7 +76,7 @@ class SocieteAccount extends CommonObject
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'default'=>1),
 		'key_account' => array('type'=>'varchar(128)', 'label'=>'KeyAccount', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Key account',),
@@ -97,7 +97,7 @@ class SocieteAccount extends CommonObject
 		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
 		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active','0'=>'Disabled')),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'default'=>1, 'arrayofkeyval'=>array('1'=>'Active', '0'=>'Disabled')),
 	);
 
 	/**
@@ -199,7 +199,7 @@ class SocieteAccount extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
 	}
 
 	/**
@@ -275,7 +275,7 @@ class SocieteAccount extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -286,11 +286,11 @@ class SocieteAccount extends CommonObject
 	 */
 	public function fetchLines()
 	{
-		$this->lines=array();
+		$this->lines = array();
 
 		// Load lines with object societeAccountLine
 
-		return count($this->lines)?1:0;
+		return count($this->lines) ? 1 : 0;
 	}
 
 	/**
@@ -306,15 +306,15 @@ class SocieteAccount extends CommonObject
 	public function getCustomerAccount($id, $site, $status = 0, $site_account = '')
 	{
 		$sql = "SELECT sa.key_account as key_account, sa.entity";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
-		$sql .= " WHERE sa.fk_soc = " . $id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as sa";
+		$sql .= " WHERE sa.fk_soc = ".$id;
 		$sql .= " AND sa.entity IN (".getEntity('societe').")";
 		$sql .= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
 		$sql .= " AND sa.key_account IS NOT NULL AND sa.key_account <> ''";
 		$sql .= " AND (sa.site_account = '' OR sa.site_account IS NULL OR sa.site_account = '".$this->db->escape($site_account)."')";
-		$sql .= " ORDER BY sa.site_account DESC";	// To get the entry with a site_account defined in priority
+		$sql .= " ORDER BY sa.site_account DESC"; // To get the entry with a site_account defined in priority
 
-		dol_syslog(get_class($this) . "::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
+		dol_syslog(get_class($this)."::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result)) {
@@ -344,13 +344,13 @@ class SocieteAccount extends CommonObject
 		$socid = 0;
 
 		$sql = "SELECT sa.fk_soc as fk_soc, sa.key_account, sa.entity";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
-		$sql.= " WHERE sa.key_account = '".$this->db->escape($id)."'";
-		$sql.= " AND sa.entity IN (".getEntity('societe').")";
-		$sql.= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
-		$sql.= " AND sa.fk_soc > 0";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account as sa";
+		$sql .= " WHERE sa.key_account = '".$this->db->escape($id)."'";
+		$sql .= " AND sa.entity IN (".getEntity('societe').")";
+		$sql .= " AND sa.site = '".$this->db->escape($site)."' AND sa.status = ".((int) $status);
+		$sql .= " AND sa.fk_soc > 0";
 
-		dol_syslog(get_class($this) . "::getCustomerAccount Try to find the first thirdparty id for ".$site." for external id=".$id, LOG_DEBUG);
+		dol_syslog(get_class($this)."::getCustomerAccount Try to find the first thirdparty id for ".$site." for external id=".$id, LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result)) {
@@ -402,16 +402,16 @@ class SocieteAccount extends CommonObject
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
-        if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
         $result = '';
         $companylink = '';
 
         $this->ref = $this->login;
 
-        $label = '<u>' . $langs->trans("SocieteAccount") . '</u>';
-        $label.= '<br>';
-        $label.= '<b>' . $langs->trans('Login') . ':</b> ' . $this->ref;
+        $label = '<u>'.$langs->trans("SocieteAccount").'</u>';
+        $label .= '<br>';
+        $label .= '<b>'.$langs->trans('Login').':</b> '.$this->ref;
         //$label.= '<b>' . $langs->trans('WebSite') . ':</b> ' . $this->ref;
 
         $url = dol_buildpath('/website/websiteaccount_card.php', 1).'?id='.$this->id;
@@ -419,31 +419,31 @@ class SocieteAccount extends CommonObject
         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))
         {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
             {
-                $label=$langs->trans("ShowsocieteAccount");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+                $label = $langs->trans("ShowsocieteAccount");
+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
             }
-            $linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+            $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
         }
-        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 
 		return $result;
@@ -475,7 +475,7 @@ class SocieteAccount extends CommonObject
 
 		if ($mode == 0)
 		{
-			$prefix='';
+			$prefix = '';
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
 		}
@@ -520,10 +520,10 @@ class SocieteAccount extends CommonObject
 	public function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -534,7 +534,7 @@ class SocieteAccount 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)
@@ -548,7 +548,7 @@ class SocieteAccount extends CommonObject
 				{
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
+					$this->user_cloture = $cluser;
 				}
 
 				$this->date_creation     = $this->db->jdate($obj->datec);
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index 8ee7d0f02ee..db7802074c1 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -1,5 +1,5 @@
 <?php
-if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 /* <style type="text/css" > */
 /*
  Badge style is based on boostrap framework
@@ -178,7 +178,7 @@ a.badge-dark:focus, a.badge-dark:hover {
  * STATUS BADGES
  */
 <?php
-for ($i = 0; $i <= 9; $i++){
+for ($i = 0; $i <= 9; $i++) {
 	/* Default Status */
 	_createStatusBadgeCss($i, '', "STATUS".$i);
 
@@ -200,15 +200,15 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 	global ${$statusVarNamePrefix.'badgeStatus'.$statusName}, ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
 
-	if(!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
-		print "\n/* " . strtoupper($commentLabel) . " */\n";
-		$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix . 'badgeStatus' . $statusName};
+	if (!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
+		print "\n/* ".strtoupper($commentLabel)." */\n";
+		$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix.'badgeStatus'.$statusName};
 
 		$TBadgeBorderOnly = array(0, 3, 5, 7);
-		$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix . 'badgeStatus' . $statusName}) ? '#212529' : '#ffffff';
+		$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix.'badgeStatus'.$statusName}) ? '#212529' : '#ffffff';
 
-		if (!empty(${$statusVarNamePrefix . 'badgeStatus_textColor' . $statusName})) {
-			$thisBadgeTextColor = ${$statusVarNamePrefix . 'badgeStatus_textColor' . $statusName};
+		if (!empty(${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName})) {
+			$thisBadgeTextColor = ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
 		}
 
 		if (in_array($statusName, $TBadgeBorderOnly)) {
@@ -219,28 +219,28 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		if (in_array($statusName, array(0, 5, 9))) $thisBadgeTextColor = '#999999';
 		if (in_array($statusName, array(6))) $thisBadgeTextColor = '#777777';
 
-		print $cssPrefix . ".badge-status" . $statusName . " {\n";
-		print "        color: " . $thisBadgeTextColor . " !important;\n";
+		print $cssPrefix.".badge-status".$statusName." {\n";
+		print "        color: ".$thisBadgeTextColor." !important;\n";
 		if (in_array($statusName, $TBadgeBorderOnly)) {
-			print "        border-color: " . $thisBadgeBorderColor . ";\n";
+			print "        border-color: ".$thisBadgeBorderColor.";\n";
 		}
-		print "        background-color: " . $thisBadgeBackgroundColor . ";\n";
+		print "        background-color: ".$thisBadgeBackgroundColor.";\n";
 		print "}\n";
 
-		print $cssPrefix . ".font-status" . $statusName . " {\n";
-		print "        color: " . $thisBadgeBackgroundColor . " !important;\n";
+		print $cssPrefix.".font-status".$statusName." {\n";
+		print "        color: ".$thisBadgeBackgroundColor." !important;\n";
 		print "}\n";
 
-		print $cssPrefix . ".badge-status" . $statusName . ".focus, " . $cssPrefix . ".badge-status" . $statusName . ":focus {\n";
+		print $cssPrefix.".badge-status".$statusName.".focus, ".$cssPrefix.".badge-status".$statusName.":focus {\n";
 		print "    outline: 0;\n";
-		print "    box-shadow: 0 0 0 0.2rem " . colorHexToRgb($thisBadgeBackgroundColor, 0.5) . ";\n";
+		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5).";\n";
 		print "}\n";
 
-		print $cssPrefix . ".badge-status" . $statusName . ":focus, " . $cssPrefix . ".badge-status" . $statusName . ":hover {\n";
-		print "    color: " . $thisBadgeTextColor . " !important;\n";
+		print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
+		print "    color: ".$thisBadgeTextColor." !important;\n";
 		//print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
 		if (in_array($statusName, $TBadgeBorderOnly)) {
-			print "        border-color: " . colorDarker($thisBadgeBorderColor, 10) . ";\n";
+			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
 		}
 		print "}\n";
 	}
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 3c544fbb4a4..575b73c15f1 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -80,8 +80,8 @@ $toolTipFontColor = '#333';
 // text color
 $textSuccess   = '#28a745';
 $colorblind_deuteranopes_textSuccess = '#37de5d';
-$textWarning   = '#a37c0d';		// See $badgeWarning
-$textDanger    = '#9f4705';		// See $badgeDanger
+$textWarning   = '#a37c0d'; // See $badgeWarning
+$textDanger    = '#9f4705'; // See $badgeDanger
 $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color
 
 
@@ -89,8 +89,8 @@ $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested wit
 $badgePrimary   = '#007bff';
 $badgeSecondary = '#cccccc';
 $badgeSuccess   = '#55a580';
-$badgeWarning   = '#a37c0d';	// See $textDanger bc9526
-$badgeDanger    = '#9f4705';	// See $textDanger
+$badgeWarning   = '#a37c0d'; // See $textDanger bc9526
+$badgeDanger    = '#9f4705'; // See $textDanger
 $badgeInfo      = '#aaaabb';
 $badgeDark      = '#343a40';
 $badgeLight     = '#f8f9fa';
@@ -108,7 +108,7 @@ $badgeStatus0 = '#cbd3d3';
 $badgeStatus1 = '#bc9526';
 $badgeStatus2 = '#e6f0f0';
 $badgeStatus3 = '#bca52b';
-$badgeStatus4 = '#55a580';		// Color ok
+$badgeStatus4 = '#55a580'; // Color ok
 $badgeStatus5 = '#cad2d2';
 $badgeStatus6 = '#cad2d2';
 $badgeStatus7 = '#baa32b';
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index cb389dc6f11..22e9dee6917 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -1,5 +1,5 @@
 <?php
-if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 /* <style type="text/css" > */
 /*
  Badge style is based on boostrap framework
@@ -166,7 +166,7 @@ a.badge-dark:focus, a.badge-dark:hover {
 /*
  * STATUS BADGES
  */
-<?php for ($i = 0; $i <= 9; $i++){
+<?php for ($i = 0; $i <= 9; $i++) {
 	/* Default Status */
 	_createStatusBadgeCss($i, '', "STATUS".$i);
 
@@ -188,16 +188,16 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 	global ${$statusVarNamePrefix.'badgeStatus'.$statusName}, ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
 
-	if(!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
-		print "\n/* " . strtoupper($commentLabel) . " */\n";
-		$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix . 'badgeStatus' . $statusName};
+	if (!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
+		print "\n/* ".strtoupper($commentLabel)." */\n";
+		$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix.'badgeStatus'.$statusName};
 
 
 		$TBadgeBorderOnly = array(0, 3, 5, 7);
-		$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix . 'badgeStatus' . $statusName}) ? '#212529' : '#ffffff';
+		$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix.'badgeStatus'.$statusName}) ? '#212529' : '#ffffff';
 
-		if (!empty(${$statusVarNamePrefix . 'badgeStatus_textColor' . $statusName})) {
-			$thisBadgeTextColor = ${$statusVarNamePrefix . 'badgeStatus_textColor' . $statusName};
+		if (!empty(${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName})) {
+			$thisBadgeTextColor = ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
 		}
 
 		if (in_array($statusName, $TBadgeBorderOnly)) {
@@ -208,28 +208,28 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		if (in_array($statusName, array(0, 5, 9))) $thisBadgeTextColor = '#999999';
 		if (in_array($statusName, array(6))) $thisBadgeTextColor = '#777777';
 
-		print $cssPrefix . ".badge-status" . $statusName . " {\n";
-		print "        color: " . $thisBadgeTextColor . " !important;\n";
+		print $cssPrefix.".badge-status".$statusName." {\n";
+		print "        color: ".$thisBadgeTextColor." !important;\n";
 		if (in_array($statusName, $TBadgeBorderOnly)) {
-			print "        border-color: " . $thisBadgeBorderColor . ";\n";
+			print "        border-color: ".$thisBadgeBorderColor.";\n";
 		}
-		print "        background-color: " . $thisBadgeBackgroundColor . ";\n";
+		print "        background-color: ".$thisBadgeBackgroundColor.";\n";
 		print "}\n";
 
-		print $cssPrefix . ".font-status" . $statusName . " {\n";
-		print "        color: " . $thisBadgeBackgroundColor . " !important;\n";
+		print $cssPrefix.".font-status".$statusName." {\n";
+		print "        color: ".$thisBadgeBackgroundColor." !important;\n";
 		print "}\n";
 
-		print $cssPrefix . ".badge-status" . $statusName . ".focus, " . $cssPrefix . ".badge-status" . $statusName . ":focus {\n";
+		print $cssPrefix.".badge-status".$statusName.".focus, ".$cssPrefix.".badge-status".$statusName.":focus {\n";
 		print "    outline: 0;\n";
-		print "    box-shadow: 0 0 0 0.2rem " . colorHexToRgb($thisBadgeBackgroundColor, 0.5) . ";\n";
+		print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5).";\n";
 		print "}\n";
 
-		print $cssPrefix . ".badge-status" . $statusName . ":focus, " . $cssPrefix . ".badge-status" . $statusName . ":hover {\n";
-		print "    color: " . $thisBadgeTextColor . " !important;\n";
-		print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
+		print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
+		print "    color: ".$thisBadgeTextColor." !important;\n";
+		print "    background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n";
 		if (in_array($statusName, $TBadgeBorderOnly)) {
-			print "        border-color: " . colorDarker($thisBadgeBorderColor, 10) . ";\n";
+			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
 		}
 		print "}\n";
 	}
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index b1bafcc7717..5f0d1868481 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -73,16 +73,16 @@ $fontsizesmaller = '11';
 // text color
 $textSuccess   = '#28a745';
 $colorblind_deuteranopes_textSuccess = '#37de5d';
-$textWarning   = '#a37c0d';		// See $badgeWarning
-$textDanger    = '#8c4446';		// See $badgeDanger
+$textWarning   = '#a37c0d'; // See $badgeWarning
+$textDanger    = '#8c4446'; // See $badgeDanger
 $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color
 
 // Badges colors
 $badgePrimary   = '#007bff';
 $badgeSecondary = '#999999';
 $badgeSuccess   = '#28a745';
-$badgeWarning   = '#a37c0d';	// See $textWarning
-$badgeDanger    = '#8c4446';	// See $textDanger
+$badgeWarning   = '#a37c0d'; // See $textWarning
+$badgeDanger    = '#8c4446'; // See $textDanger
 $badgeInfo      = '#17a2b8';
 $badgeDark      = '#343a40';
 $badgeLight     = '#f8f9fa';