diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 1b69e035fba..a593e10adf4 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -18,7 +18,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf)) {
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -36,14 +36,14 @@ $langs->load("orders");
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
 
-$total=0;
-$ilink=0;
-foreach($linkedObjectBlock as $key => $objectlink)
+$total = 0;
+$ilink = 0;
+foreach ($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
 
-    $trclass='oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+    $trclass = 'oddeven';
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
     echo '<tr class="'.$trclass.'" >';
     echo '<td class="linkedcol-element" >'.$langs->trans("CustomerOrder");
     if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
@@ -62,14 +62,14 @@ foreach($linkedObjectBlock as $key => $objectlink)
     echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
     echo '<td class="linkedcol-action right">';
     // For now, shipments must stay linked to order, so link is not deletable
-    if($object->element != 'shipping') {
+    if ($object->element != 'shipping') {
         echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
     }
     echo '</td>';
     echo "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1) {
-    echo '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter)?'liste_sub_total':'').'">';
+    echo '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
     echo '<td>'.$langs->trans("Total").'</td>';
     echo '<td></td>';
     echo '<td class="center"></td>';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 0d39cda6513..f0854eabde2 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1216,7 +1216,7 @@ if (empty($reshook))
 				// Si facture standard
 				$object->socid = GETPOST('socid', 'int');
 				$object->type				= GETPOST('type');
-				$object->ref                = $_POST['ref'];
+				$object->ref = $_POST['ref'];
 				$object->date				= $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
 				$object->note_public		= trim(GETPOST('note_public', 'none'));
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
new file mode 100644
index 00000000000..957c738ad22
--- /dev/null
+++ b/htdocs/core/boxes/box_shipments.php
@@ -0,0 +1,190 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019      Alexandre Spangaro   <aspangaro@open-dsi.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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *		\file       htdocs/core/boxes/box_shipments.php
+ *		\ingroup    shipment
+ *		\brief      Module for generating the display of the shipment box
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
+
+
+/**
+ * Class to manage the box to show last shipments
+ */
+class box_shipments extends ModeleBoxes
+{
+    public $boxcode="lastcustomershipments";
+    public $boximg="sending";
+    public $boxlabel="BoxLastCustomerShipments";
+    public $depends = array("expedition");
+
+	/**
+     * @var DoliDB Database handler.
+     */
+    public $db;
+
+    public $param;
+
+    public $info_box_head = array();
+    public $info_box_contents = array();
+
+
+    /**
+     *  Constructor
+     *
+     *  @param  DoliDB  $db         Database handler
+     *  @param  string  $param      More parameters
+     */
+    public function __construct($db, $param)
+    {
+        global $user;
+
+        $this->db=$db;
+
+        $this->hidden=! ($user->rights->expedition->lire);
+    }
+
+    /**
+     *  Load data for box to show them later
+     *
+     *  @param	int		$max        Maximum number of records to load
+     *  @return	void
+     */
+    public function loadBox($max = 5)
+    {
+        global $user, $langs, $conf;
+        $langs->loadLangs(array('orders', 'sendings'));
+
+        $this->max = $max;
+
+        include_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
+        $shipmentstatic = new Expedition($this->db);
+        $orderstatic = new Commande($this->db);
+        $societestatic = new Societe($this->db);
+
+        $this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerShipments", $max));
+
+        if ($user->rights->expedition->lire)
+        {
+            $sql = "SELECT s.nom as name";
+            $sql.= ", s.rowid as socid";
+            $sql.= ", s.code_client";
+            $sql.= ", s.logo, s.email";
+            $sql.= ", e.ref, e.tms";
+            $sql.= ", e.rowid";
+            $sql.= ", e.ref_customer";
+            $sql.= ", e.fk_statut";
+            $sql.= ", e.fk_user_valid";
+            $sql.= ", c.ref as commande_ref";
+            $sql.= ", c.rowid as commande_id";
+            $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
+            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+            $sql.= " WHERE e.entity = ".$conf->entity;
+            if (! empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql.=" AND e.fk_statut = 1";
+            if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND sc.fk_user = " .$user->id;
+            else $sql.= " ORDER BY e.date_delivery, e.ref DESC ";
+            $sql.= $this->db->plimit($max, 0);
+
+            $result = $this->db->query($sql);
+            if ($result) {
+                $num = $this->db->num_rows($result);
+
+                $line = 0;
+
+                while ($line < $num) {
+                    $objp = $this->db->fetch_object($result);
+
+                    $shipmentstatic->id = $objp->rowid;
+                    $shipmentstatic->ref = $objp->ref;
+                    $shipmentstatic->ref_customer = $objp->ref_customer;
+
+                    $orderstatic->id= $objp->commande_id;
+                    $orderstatic->ref=$objp->commande_ref;
+
+                    $societestatic->id = $objp->socid;
+                    $societestatic->name = $objp->name;
+                    $societestatic->email = $objp->email;
+                    $societestatic->code_client = $objp->code_client;
+                    $societestatic->logo = $objp->logo;
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => '',
+                        'text' => $shipmentstatic->getNomUrl(1),
+                        'asis' => 1,
+                    );
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+                        'text' => $societestatic->getNomUrl(1),
+                        'asis' => 1,
+                    );
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => '',
+                        'text' => $orderstatic->getNomUrl(1),
+                        'asis' => 1,
+                    );
+
+                    $this->info_box_contents[$line][] = array(
+                        'td' => 'class="right" width="18"',
+                        'text' => $shipmentstatic->LibStatut($objp->fk_statut, 3),
+                    );
+
+                    $line++;
+                }
+
+                if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedShipments"));
+
+                $this->db->free($result);
+            } else {
+                $this->info_box_contents[0][0] = array(
+                    'td' => '',
+                    'maxlength'=>500,
+                    'text' => ($this->db->error().' sql='.$sql),
+                );
+            }
+        } else {
+            $this->info_box_contents[0][0] = array(
+                'td' => 'class="nohover opacitymedium left"',
+                'text' => $langs->trans("ReadPermissionNotAllowed")
+            );
+        }
+    }
+
+	/**
+	 *	Method to show box
+	 *
+	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *	@return	string
+	 */
+    public function showBox($head = null, $contents = null, $nooutput = 0)
+    {
+        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+    }
+}
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 68f4a3d5fba..d8225a1b2a5 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -133,7 +133,9 @@ class modExpedition extends DolibarrModules
 		$r++;
 
 		// Boxes
-		$this->boxes = array();
+		$this->boxes = array(
+			0=>array('file'=>'box_shipments.php','enabledbydefaulton'=>'Home'),
+		);
 
 		// Permissions
 		$this->rights = array();
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 1cc0e30934d..fbc1763beb3 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -17,7 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -35,14 +35,14 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 // Load translation files required by the page
 $langs->load("sendings");
 
-$total=0;
-$ilink=0;
-foreach($linkedObjectBlock as $key => $objectlink)
+$total = 0;
+$ilink = 0;
+foreach ($linkedObjectBlock as $key => $objectlink)
 {
     $ilink++;
 
-    $trclass='oddeven';
-    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+    $trclass = 'oddeven';
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
     ?>
     <tr class="<?php echo $trclass; ?>">
         <td><?php echo $langs->trans("Shipment"); ?></td>
@@ -58,7 +58,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
     	<td class="right">
     		<?php
     		// For now, shipments must stay linked to order, so link is not deletable
-    		if($object->element != 'commande') {
+    		if ($object->element != 'commande') {
     			?>
     			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     			<?php
@@ -69,7 +69,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 }
 if (count($linkedObjectBlock) > 1) {
     ?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter)?'liste_sub_total':''); ?>">
+    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
     	<td class="center"></td>
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index a55a0194632..8fe1f84b149 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -97,3 +97,6 @@ BoxSuspenseAccount=Count accountancy operation with suspense account
 BoxTitleSuspenseAccount=Number of unallocated lines
 NumberOfLinesInSuspenseAccount=Number of line in suspense account
 SuspenseAccountNotDefined=Suspense account isn't defined
+BoxLastCustomerShipments=Last customer shipments
+BoxTitleLastCustomerShipments=Latest %s customer shipments
+NoRecordedShipments=No recorded customer shipment
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2fe3dbc140a..6b17bb6f947 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -89,28 +89,28 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/<iframe/i', $val);
 	$inj += preg_match('/<audio/i', $val);
-	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+	$inj += preg_match('/Set\.constructor/i', $val); // ECMA script 6
+	if (!defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
 	$inj += preg_match('/base[\s]+href/si', $val);
 	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp
-	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $val);        //
-	$inj += preg_match('/ontouch([a-z]*)\s*=/i', $val);        //
+	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $val); //
+	$inj += preg_match('/ontouch([a-z]*)\s*=/i', $val); //
 	$inj += preg_match('/on(abort|afterprint|beforeprint|beforeunload|blur|canplay|canplaythrough|change|click|contextmenu|copy|cut)\s*=/i', $val);
 	$inj += preg_match('/on(dblclick|drop|durationchange|ended|error|focus|focusin|focusout|hashchange|input|invalid)\s*=/i', $val);
 	$inj += preg_match('/on(keydown|keypress|keyup|load|loadeddata|loadedmetadata|loadstart|offline|online|pagehide|pageshow)\s*=/i', $val);
 	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|resize|reset|scroll|search|seeking|select|show|stalled|start|submit|suspend)\s*=/i', $val);
 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $val);
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 	//if ($type == 1)
 	//{
 		$inj += preg_match('/javascript:/i', $val);
 		$inj += preg_match('/vbscript:/i', $val);
 	//}
 	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-	if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-	if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+	if ($type == 1) $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
+	if ($type == 2) $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
 	return $inj;
 }
 
@@ -246,40 +246,40 @@ if (!empty($conf->debugbar->enabled))
 // Detection browser
 if (isset($_SERVER["HTTP_USER_AGENT"]))
 {
-	$tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
-	$conf->browser->name=$tmp['browsername'];
-	$conf->browser->os=$tmp['browseros'];
-	$conf->browser->version=$tmp['browserversion'];
-	$conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
+	$tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+	$conf->browser->name = $tmp['browsername'];
+	$conf->browser->os = $tmp['browseros'];
+	$conf->browser->version = $tmp['browserversion'];
+	$conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
 	//var_dump($conf->browser);
 
-	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
+	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover = 1;
 }
 
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
-if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
+if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
 {
-	$newurl='';
+	$newurl = '';
 	if (is_numeric($conf->file->main_force_https))
 	{
-		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+		if ($conf->file->main_force_https == '1' && !empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
 		{
-			if (preg_match('/^http:/i', $_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i', $_SERVER["SCRIPT_URI"]))	// If link is http
+			if (preg_match('/^http:/i', $_SERVER["SCRIPT_URI"]) && !preg_match('/^https:/i', $_SERVER["SCRIPT_URI"]))	// If link is http
 			{
-				$newurl=preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
+				$newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
 			}
 		}
 		else	// Check HTTPS environment variable (Apache/mod_ssl only)
 		{
-			$newurl=preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
+			$newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
 		}
 	}
 	else
 	{
 		// Check HTTPS environment variable (Apache/mod_ssl only)
-		$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
+		$newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];
 	}
 	// Start redirect
 	if ($newurl)
@@ -359,10 +359,10 @@ if (!defined('NOTOKENRENEWAL'))
 //$dolibarr_nocsrfcheck=1;
 // Check token
 //var_dump((! defined('NOCSRFCHECK')).' '.empty($dolibarr_nocsrfcheck).' '.(! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)).' '.$_SERVER['REQUEST_METHOD'].' '.(! GETPOSTISSET('token')));
-if ((! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
+if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
 	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
 {
-	if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOSTISSET('token')) // Note: offender can still send request by GET
+	if ($_SERVER['REQUEST_METHOD'] == 'POST' && !GETPOSTISSET('token')) // Note: offender can still send request by GET
 	{
 		dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused by CSRFCHECK_WITH_TOKEN protection. Token not provided.");
 		print "Access by POST method refused by CSRF protection in main.inc.php. Token not provided.\n";
@@ -374,33 +374,33 @@ if ((! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->
 	{
 		dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused due to invalid token, so we disable POST and some GET parameters - referer=".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
 		//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
-		if ($conf->global->MAIN_FEATURES_LEVEL>1) setEventMessages('Unset POST by CSRF protection in main.inc.php (POST for this token was already done or was done by a not allowed web page with a wrong token).'."<br>\n".'$_SERVER[REQUEST_URI] = '.$_SERVER['REQUEST_URI'].' $_SERVER[REQUEST_METHOD] = '.$_SERVER['REQUEST_METHOD'].' GETPOST(token) = '.GETPOST('token', 'alpha').' $_SESSION[token] = '.$_SESSION['token'], null, 'warnings');
+		if ($conf->global->MAIN_FEATURES_LEVEL > 1) setEventMessages('Unset POST by CSRF protection in main.inc.php (POST for this token was already done or was done by a not allowed web page with a wrong token).'."<br>\n".'$_SERVER[REQUEST_URI] = '.$_SERVER['REQUEST_URI'].' $_SERVER[REQUEST_METHOD] = '.$_SERVER['REQUEST_METHOD'].' GETPOST(token) = '.GETPOST('token', 'alpha').' $_SESSION[token] = '.$_SESSION['token'], null, 'warnings');
 		unset($_POST);
 		unset($_GET['confirm']);
 	}
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOSTISSET('disablemodules'))  $_SESSION["disablemodules"]=GETPOST('disablemodules', 'alpha');
-if (! empty($_SESSION["disablemodules"]))
+if (GETPOSTISSET('disablemodules'))  $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
+if (!empty($_SESSION["disablemodules"]))
 {
     $modulepartkeys = array('css', 'js', 'tabs', 'triggers', 'login', 'substitutions', 'menus', 'theme', 'sms', 'tpl', 'barcode', 'models', 'societe', 'hooks', 'dir', 'syslog', 'tpllinkable', 'contactelement', 'moduleforexternal');
 
-	$disabled_modules=explode(',', $_SESSION["disablemodules"]);
-	foreach($disabled_modules as $module)
+	$disabled_modules = explode(',', $_SESSION["disablemodules"]);
+	foreach ($disabled_modules as $module)
 	{
 		if ($module)
 		{
-			if (empty($conf->$module)) $conf->$module=new stdClass();    // To avoid warnings
-			$conf->$module->enabled=false;
-			foreach($modulepartkeys as $modulepartkey)
+			if (empty($conf->$module)) $conf->$module = new stdClass(); // To avoid warnings
+			$conf->$module->enabled = false;
+			foreach ($modulepartkeys as $modulepartkey)
 			{
 			    unset($conf->modules_parts[$modulepartkey][$module]);
 			}
 			if ($module == 'fournisseur')		// Special case
 			{
-				$conf->supplier_order->enabled=0;
-				$conf->supplier_invoice->enabled=0;
+				$conf->supplier_order->enabled = 0;
+				$conf->supplier_invoice->enabled = 0;
 			}
 		}
 	}
@@ -454,75 +454,75 @@ if (!defined('NOLOGIN'))
 	// If login request was already post, we retrieve login from the session
 	// Call module if not realized that his request.
 	// At the end of this phase, the variable $login is defined.
-	$resultFetchUser='';
-	$test=true;
-	if (! isset($_SESSION["dol_login"]))
+	$resultFetchUser = '';
+	$test = true;
+	if (!isset($_SESSION["dol_login"]))
 	{
 		// It is not already authenticated and it requests the login / password
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-		$dol_dst_observed=GETPOST("dst_observed", 'int', 3);
-		$dol_dst_first=GETPOST("dst_first", 'int', 3);
-		$dol_dst_second=GETPOST("dst_second", 'int', 3);
-		$dol_screenwidth=GETPOST("screenwidth", 'int', 3);
-		$dol_screenheight=GETPOST("screenheight", 'int', 3);
-		$dol_hide_topmenu=GETPOST('dol_hide_topmenu', 'int', 3);
-		$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu', 'int', 3);
-		$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen', 'int', 3);
-		$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover', 'int', 3);
-		$dol_use_jmobile=GETPOST('dol_use_jmobile', 'int', 3);			// 0=default, 1=to say we use app from a webview app, 2=to say we use app from a webview app and keep ajax
+		$dol_dst_observed = GETPOST("dst_observed", 'int', 3);
+		$dol_dst_first = GETPOST("dst_first", 'int', 3);
+		$dol_dst_second = GETPOST("dst_second", 'int', 3);
+		$dol_screenwidth = GETPOST("screenwidth", 'int', 3);
+		$dol_screenheight = GETPOST("screenheight", 'int', 3);
+		$dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int', 3);
+		$dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int', 3);
+		$dol_optimize_smallscreen = GETPOST('dol_optimize_smallscreen', 'int', 3);
+		$dol_no_mouse_hover = GETPOST('dol_no_mouse_hover', 'int', 3);
+		$dol_use_jmobile = GETPOST('dol_use_jmobile', 'int', 3); // 0=default, 1=to say we use app from a webview app, 2=to say we use app from a webview app and keep ajax
 		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
 		// If in demo mode, we check we go to home page through the public/demo/index.php page
-		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+		if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
 		{
-			if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/', $_SERVER['HTTP_REFERER']))
+			if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER']))
 			{
 				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
-				$url='';
-				$url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
-				$url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
-				$url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
-				$url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
-				$url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
-				$url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
+				$url = '';
+				$url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
+				$url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');
+				$url .= ($url ? '&' : '').($dol_optimize_smallscreen ? 'dol_optimize_smallscreen='.$dol_optimize_smallscreen : '');
+				$url .= ($url ? '&' : '').($dol_no_mouse_hover ? 'dol_no_mouse_hover='.$dol_no_mouse_hover : '');
+				$url .= ($url ? '&' : '').($dol_use_jmobile ? 'dol_use_jmobile='.$dol_use_jmobile : '');
+				$url = DOL_URL_ROOT.'/public/demo/index.php'.($url ? '?'.$url : '');
 				header("Location: ".$url);
 				exit;
 			}
 		}
 
 		// Verification security graphic code
-		if (GETPOST("username", "alpha", 2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && ! isset($_SESSION['dol_bypass_antispam']))
+		if (GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam']))
 		{
 			$sessionkey = 'dol_antispam_value';
-			$ok=(array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
 			// Check code
-			if (! $ok)
+			if (!$ok)
 			{
 				dol_syslog('Bad value for code, connexion refused');
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
-				$test=false;
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadValueForCode");
+				$test = false;
 
 				// Call trigger for the "security events" log
-				$user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username", "alpha", 2);
+				$user->trigger_mesg = 'ErrorBadValueForCode - login='.GETPOST("username", "alpha", 2);
 				// Call of triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+				$interface = new Interfaces($db);
+				$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
 				if ($result < 0) {
 					$error++;
 				}
 				// End Call of triggers
 
 				// Hooks on failed login
-				$action='';
+				$action = '';
 				$hookmanager->initHooks(array('login'));
-				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-				$reshook=$hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+				$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 
 				// Note: exit is done later
@@ -609,22 +609,22 @@ if (!defined('NOLOGIN'))
 		}
 
 		// End test login / passwords
-		if (! $login || (in_array('ldap', $authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+		if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
 		{
 			// No data to test login, so we show the login page.
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit");
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-			else dol_loginfunction($langs, $conf, (! empty($mysoc)?$mysoc:''));
+			else dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
 			exit;
 		}
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
 		if ($resultFetchUser <= 0)
 		{
 			dol_syslog('User not found, connexion refused');
 			session_destroy();
 			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+			session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
 			session_start();
 
 			if ($resultFetchUser == 0)
@@ -632,56 +632,56 @@ if (!defined('NOLOGIN'))
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
 			}
 			if ($resultFetchUser < 0)
 			{
-				$_SESSION["dol_loginmesg"]=$user->error;
+				$_SESSION["dol_loginmesg"] = $user->error;
 
-				$user->trigger_mesg=$user->error;
+				$user->trigger_mesg = $user->error;
 			}
 
 			// Call triggers for the "security events" log
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
+			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+			$interface = new Interfaces($db);
+			$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
 			if ($result < 0) {
 				$error++;
 			}
 			// End call triggers
 
 			// Hooks on failed login
-			$action='';
+			$action = '';
 			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) $error++;
 
-			$paramsurl=array();
-			if (GETPOST('textbrowser', 'int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser', 'int');
-			if (GETPOST('nojs', 'int'))        $paramsurl[]='nojs='.GETPOST('nojs', 'int');
-			if (GETPOST('lang', 'aZ09'))       $paramsurl[]='lang='.GETPOST('lang', 'aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&', $paramsurl):''));
+			$paramsurl = array();
+			if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		}
 	}
 	else
 	{
 		// We are already into an authenticated session
-		$login=$_SESSION["dol_login"];
-		$entity=$_SESSION["dol_entity"];
+		$login = $_SESSION["dol_login"];
+		$entity = $_SESSION["dol_entity"];
 		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
 		if ($resultFetchUser <= 0)
 		{
 			// Account has been removed after login
 			dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
 			session_destroy();
 			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
+			session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
 			session_start();
 
 			if ($resultFetchUser == 0)
@@ -689,38 +689,38 @@ if (!defined('NOLOGIN'))
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
 			}
 			if ($resultFetchUser < 0)
 			{
-				$_SESSION["dol_loginmesg"]=$user->error;
+				$_SESSION["dol_loginmesg"] = $user->error;
 
-				$user->trigger_mesg=$user->error;
+				$user->trigger_mesg = $user->error;
 			}
 
 			// Call triggers for the "security events" log
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
+			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+			$interface = new Interfaces($db);
+			$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
 			if ($result < 0) {
 				$error++;
 			}
 			// End call triggers
 
 			// Hooks on failed login
-			$action='';
+			$action = '';
 			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) $error++;
 
-			$paramsurl=array();
-			if (GETPOST('textbrowser', 'int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser', 'int');
-			if (GETPOST('nojs', 'int'))        $paramsurl[]='nojs='.GETPOST('nojs', 'int');
-			if (GETPOST('lang', 'aZ09'))       $paramsurl[]='lang='.GETPOST('lang', 'aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&', $paramsurl):''));
+			$paramsurl = array();
+			if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		}
 		else
@@ -740,24 +740,24 @@ if (!defined('NOLOGIN'))
 			    //var_dump($relativepathstring);
 
 			    // We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-			    if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+			    if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
 			    {
-			    	$_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+			    	$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
 				    unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
 			    }
-			    if (! empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
+			    if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
 			    {
-			    	$_SESSION['lastsearch_contextpage_'.$relativepathstring]=$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
+			    	$_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
 			    	unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
 			    }
-			    if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0)
+			    if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0)
 			    {
-			    	$_SESSION['lastsearch_page_'.$relativepathstring]=$_SESSION['lastsearch_page_tmp_'.$relativepathstring];
+			    	$_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
 			    	unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
 			    }
-			    if (! empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
+			    if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
 			    {
-			    	$_SESSION['lastsearch_limit_'.$relativepathstring]=$_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+			    	$_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
 			    	unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 			    }
 		    }
@@ -872,69 +872,69 @@ if (!defined('NOLOGIN'))
 	if (empty($conf->global->MAIN_FORCETHEME) && !empty($user->conf->MAIN_THEME))
 	{
 		$conf->theme = $user->conf->MAIN_THEME;
-		$conf->css  = "/theme/".$conf->theme."/style.css.php";
+		$conf->css = "/theme/".$conf->theme."/style.css.php";
 	}
 }
 
 // Case forcing style from url
 if (GETPOST('theme', 'alpha'))
 {
-	$conf->theme=GETPOST('theme', 'alpha', 1);
+	$conf->theme = GETPOST('theme', 'alpha', 1);
 	$conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 
 
 // Set javascript option
-if (! GETPOST('nojs', 'int'))   // If javascript was not disabled on URL
+if (!GETPOST('nojs', 'int'))   // If javascript was not disabled on URL
 {
-	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
+	if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
 	{
-		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+		$conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
 	}
 }
-else $conf->use_javascript_ajax=0;
+else $conf->use_javascript_ajax = 0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
-if (GETPOST('textbrowser', 'int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
+if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
+	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
 }
-elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
+elseif (!empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
+	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = $user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
 
 // set MAIN_OPTIMIZEFORCOLORBLIND
-$conf->global->MAIN_OPTIMIZEFORCOLORBLIND=$user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
+$conf->global->MAIN_OPTIMIZEFORCOLORBLIND = $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu', 'int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu', 'int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen', 'int') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover', 'int') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile', 'int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
-if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
-if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
-	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
-	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
+if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu = 1;
+if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu = 1;
+if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen = 1;
+if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover = 1;
+if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile = 1;
+if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover = 1;
+if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone')
+	|| (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
+	|| (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 )
 {
-	$conf->dol_optimize_smallscreen=1;
+	$conf->dol_optimize_smallscreen = 1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
 // Replace themes bugged with jmobile with eldy
-if (! empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea','cameleo','amarok')))
+if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok')))
 {
-	$conf->theme='eldy';
-	$conf->css  =  "/theme/".$conf->theme."/style.css.php";
+	$conf->theme = 'eldy';
+	$conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 
-if (! defined('NOREQUIRETRAN'))
+if (!defined('NOREQUIRETRAN'))
 {
-	if (! GETPOST('lang', 'aZ09'))	// If language was not forced on URL
+	if (!GETPOST('lang', 'aZ09'))	// If language was not forced on URL
 	{
 		// If user has chosen its own language
-		if (! empty($user->conf->MAIN_LANG_DEFAULT))
+		if (!empty($user->conf->MAIN_LANG_DEFAULT))
 		{
 			// If different than current language
 			//print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
@@ -1015,40 +1015,40 @@ else
 	define('ROWS_9', 8);
 }
 
-$heightforframes=50;
+$heightforframes = 50;
 
 // Init menu manager
-if (! defined('NOREQUIREMENU'))
+if (!defined('NOREQUIREMENU'))
 {
 	if (empty($user->socid))    // If internal user or not defined
 	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+		$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
 	}
 	else                        // If external user
 	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+		$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
 	// Load the menu manager (only if not already done)
-	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu', 'alpha')) $file_menu=GETPOST('menu', 'alpha');     // example: menu=eldy_menu.php
-	if (! class_exists('MenuManager'))
+	$file_menu = $conf->standard_menu;
+	if (GETPOST('menu', 'alpha')) $file_menu = GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
+	if (!class_exists('MenuManager'))
 	{
-		$menufound=0;
-		$dirmenus=array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
-		foreach($dirmenus as $dirmenu)
+		$menufound = 0;
+		$dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
+		foreach ($dirmenus as $dirmenu)
 		{
-			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
+			$menufound = dol_include_once($dirmenu."standard/".$file_menu);
 			if (class_exists('MenuManager')) break;
 		}
-		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
+		if (!class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
 		{
 			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
-			$file_menu='eldy_menu.php';
+			$file_menu = 'eldy_menu.php';
 			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 		}
 	}
-	$menumanager = new MenuManager($db, empty($user->socid)?0:1);
+	$menumanager = new MenuManager($db, empty($user->socid) ? 0 : 1);
 	$menumanager->loadMenu();
 }
 
@@ -1083,19 +1083,19 @@ if (!function_exists("llxHeader"))
 		// html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-		$tmpcsstouse='sidebar-collapse'.($morecssonbody?' '.$morecssonbody:'');
+		$tmpcsstouse = 'sidebar-collapse'.($morecssonbody ? ' '.$morecssonbody : '');
 		// If theme MD and classic layer, we open the menulayer by default.
-		if ($conf->theme == 'md' && ! in_array($conf->browser->layout, array('phone','tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		{
 		    global $mainmenu;
-		    if ($mainmenu != 'website') $tmpcsstouse=$morecssonbody;  // We do not use sidebar-collpase by default to have menuhider open by default.
+		    if ($mainmenu != 'website') $tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.
 		}
 
-		if(!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)){
-			$tmpcsstouse.= ' colorblind-'.strip_tags($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
+		if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) {
+			$tmpcsstouse .= ' colorblind-'.strip_tags($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
 		}
 
-		print '<body id="mainbody" class="'.$tmpcsstouse.'">' . "\n";
+		print '<body id="mainbody" class="'.$tmpcsstouse.'">'."\n";
 
 		// top menu and left menu area
 		if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int'))
@@ -1130,15 +1130,15 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 {
 	global $db, $conf, $hookmanager;
 
-	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+	if ($contenttype == 'text/html') header("Content-Type: text/html; charset=".$conf->file->character_set_client);
 	else header("Content-Type: ".$contenttype);
 
 	// Security options
-	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
-	if (! defined('XFRAMEOPTIONS_ALLOWALL')) header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
+	header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+	if (!defined('XFRAMEOPTIONS_ALLOWALL')) header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
 	else header("X-Frame-Options: ALLOWALL");
 	//header("X-XSS-Protection: 1");      		// XSS protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
-	if (! defined('FORCECSP'))
+	if (!defined('FORCECSP'))
 	{
 		//if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
 		//{
@@ -1148,15 +1148,15 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		//else $contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 		$contentsecuritypolicy = $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 
-		if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
 		$hookmanager->initHooks(array("main"));
 
-		$parameters=array('contentsecuritypolicy'=>$contentsecuritypolicy);
-		$result=$hookmanager->executeHooks('setContentSecurityPolicy', $parameters);    // Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint;	// Replace CSP
-		else $contentsecuritypolicy .= $hookmanager->resPrint;				// Concat CSP
+		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy);
+		$result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters); // Note that $action and $object may have been modified by some hooks
+		if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
+		else $contentsecuritypolicy .= $hookmanager->resPrint; // Concat CSP
 
-		if (! empty($contentsecuritypolicy))
+		if (!empty($contentsecuritypolicy))
 		{
 			// For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
 			// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
@@ -1199,19 +1199,19 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 	top_httphead();
 
-	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php'; // If not defined, eldy by default
 
 	print '<!doctype html>'."\n";
 
-	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang, 0, 2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+	if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang, 0, 2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
 	else print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n";
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
 	if (empty($disablehead))
 	{
-	    if (! is_object($hookmanager)) $hookmanager = new HookManager($db);
+	    if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
 	    $hookmanager->initHooks(array("main"));
 
-	    $ext='layout='.$conf->browser->layout.'&amp;version='.urlencode(DOL_VERSION);
+	    $ext = 'layout='.$conf->browser->layout.'&amp;version='.urlencode(DOL_VERSION);
 
 		print "<head>\n";
 
@@ -1219,100 +1219,100 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		// Displays meta
 		print '<meta charset="utf-8">'."\n";
-		print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";	// Do not index
-		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";		// Scale for mobile device
+		print '<meta name="robots" content="noindex'.($disablenofollow ? '' : ',nofollow').'">'."\n"; // Do not index
+		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n"; // Scale for mobile device
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
 
 		// Favicon
 		$favicon = DOL_URL_ROOT.'/theme/common/dolibarr_logo_256x256.png';
-		if (! empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
-		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+		if (!empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
+		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
+		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
 
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="https://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
         // Mobile appli like icon
-        $manifest = DOL_URL_ROOT . '/theme/'.$conf->theme.'/manifest.json.php';
-        if(!empty($manifest)){
+        $manifest = DOL_URL_ROOT.'/theme/'.$conf->theme.'/manifest.json.php';
+        if (!empty($manifest)) {
             print '<link rel="manifest" href="'.$manifest.'" />'."\n";
         }
 
-        if(!empty($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
+        if (!empty($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
             // TODO: use auto theme color switch
-            print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">' . "\n";
+            print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">'."\n";
         }
 
 		// Auto refresh page
 		if (GETPOST('autorefresh', 'int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh', 'int').'">';
 
 		// Displays title
-		$appli=constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+		$appli = constant('DOL_APPLICATION_TITLE');
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
 
 		print '<title>';
-		$titletoshow='';
-		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
+		$titletoshow = '';
+		if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
 		elseif ($title) $titletoshow = dol_htmlentities($appli.' - '.$title);
 		else $titletoshow = dol_htmlentities($appli);
 
-		$parameters=array('title'=>$titletoshow);
-		$result=$hookmanager->executeHooks('setHtmlTitle', $parameters);		// Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $titletoshow = $hookmanager->resPrint;				// Replace Title to show
-		else $titletoshow .= $hookmanager->resPrint;						// Concat to Title to show
+		$parameters = array('title'=>$titletoshow);
+		$result = $hookmanager->executeHooks('setHtmlTitle', $parameters); // Note that $action and $object may have been modified by some hooks
+		if ($result > 0) $titletoshow = $hookmanager->resPrint; // Replace Title to show
+		else $titletoshow .= $hookmanager->resPrint; // Concat to Title to show
 
 		print $titletoshow;
 		print '</title>';
 
 		print "\n";
 
-		if (GETPOST('version', 'int')) $ext='version='.GETPOST('version', 'int');	// usefull to force no cache on css/js
+		if (GETPOST('version', 'int')) $ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js
 
-		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09')?'&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
-		$themeparam.=($ext?'&amp;'.$ext:'').'&amp;revision='.$conf->global->MAIN_IHM_PARAMS_REV;
-		if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-		if (GETPOSTISSET('dol_hide_topmenu'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int'); }
-		if (GETPOSTISSET('dol_hide_leftmenu'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int'); }
-		if (GETPOSTISSET('dol_optimize_smallscreen'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
-		if (GETPOSTISSET('dol_no_mouse_hover'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
-		if (GETPOSTISSET('dol_use_jmobile'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile', 'int'); }
-		if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO'))    { $themeparam.='&amp;THEME_AGRESSIVENESS_RATIO='.GETPOST('THEME_AGRESSIVENESS_RATIO', 'int'); }
+		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+		$themeparam .= ($ext ? '&amp;'.$ext : '').'&amp;revision='.$conf->global->MAIN_IHM_PARAMS_REV;
+		if (!empty($_SESSION['dol_resetcache'])) $themeparam .= '&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+		if (GETPOSTISSET('dol_hide_topmenu')) { $themeparam .= '&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int'); }
+		if (GETPOSTISSET('dol_hide_leftmenu')) { $themeparam .= '&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int'); }
+		if (GETPOSTISSET('dol_optimize_smallscreen')) { $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
+		if (GETPOSTISSET('dol_no_mouse_hover')) { $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
+		if (GETPOSTISSET('dol_use_jmobile')) { $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); }
+		if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) { $themeparam .= '&amp;THEME_AGRESSIVENESS_RATIO='.GETPOST('THEME_AGRESSIVENESS_RATIO', 'int'); }
 
-		if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
+		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
 		{
 			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
 			$jquerytheme = 'base';
 			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // Forced JQuery
-			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";              // JQuery
-			if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
-			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // Forced JQuery
+			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
+			if (!defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
+			if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
 			{
-				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
+				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext ? '?'.$ext : '').'">'."\n";
 			}
 		}
 
-		if (! defined('DISABLE_FONT_AWSOME'))
+		if (!defined('DISABLE_FONT_AWSOME'))
 		{
 			print '<!-- Includes CSS for font awesome -->'."\n";
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/all.min.css'.($ext?'?'.$ext:'').'">'."\n";
-            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/v4-shims.min.css'.($ext?'?'.$ext:'').'">'."\n";
+            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";
+            print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/v4-shims.min.css'.($ext ? '?'.$ext : '').'">'."\n";
 		}
 
 		print '<!-- Includes CSS for Dolibarr theme -->'."\n";
 		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-		$themepath=dol_buildpath($conf->css, 1);
-		$themesubdir='';
-		if (! empty($conf->modules_parts['theme']))	// This slow down
+		$themepath = dol_buildpath($conf->css, 1);
+		$themesubdir = '';
+		if (!empty($conf->modules_parts['theme']))	// This slow down
 		{
-			foreach($conf->modules_parts['theme'] as $reldir)
+			foreach ($conf->modules_parts['theme'] as $reldir)
 			{
 				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
 				{
-					$themepath=dol_buildpath($reldir.$conf->css, 1);
-					$themesubdir=$reldir;
+					$themepath = dol_buildpath($reldir.$conf->css, 1);
+					$themesubdir = $reldir;
 					break;
 				}
 			}
@@ -1461,33 +1461,33 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
             }
 
             // Browser notifications
-            if (! defined('DISABLE_BROWSER_NOTIF'))
+            if (!defined('DISABLE_BROWSER_NOTIF'))
             {
-                $enablebrowsernotif=false;
-                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
+                $enablebrowsernotif = false;
+                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif = true;
+                if ($conf->browser->layout == 'phone') $enablebrowsernotif = false;
                 if ($enablebrowsernotif)
                 {
                     print '<!-- Includes JS of Dolibarr (browser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 }
             }
 
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
+            print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 
             // JS forced by modules (relative url starting with /)
-            if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+            if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
-        		$arrayjs=(array) $conf->modules_parts['js'];
-	            foreach($arrayjs as $modjs => $filesjs)
+        		$arrayjs = (array) $conf->modules_parts['js'];
+	            foreach ($arrayjs as $modjs => $filesjs)
 	            {
-        			$filesjs=(array) $filesjs;	// To be sure filejs is an array
-		            foreach($filesjs as $jsfile)
+        			$filesjs = (array) $filesjs; // To be sure filejs is an array
+		            foreach ($filesjs as $jsfile)
 		            {
 	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
+	        	    	print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
 		            }
 	            }
         	}
@@ -1613,15 +1613,15 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 
 
 		// Add login user link
-		$toprightmenu.='<div class="login_block_user">';
+		$toprightmenu .= '<div class="login_block_user">';
 
 		// Login name with photo and tooltip
-		$mode=-1;
-		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
+		$mode = -1;
+		$toprightmenu .= '<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
 
-        if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)){
+        if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
             // Add search dropdown
-            $toprightmenu.= top_menu_search();
+            $toprightmenu .= top_menu_search();
         }
 
         if (!empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) {
@@ -1630,56 +1630,56 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
         }
 
         // Add user dropdown
-	    $toprightmenu.= top_menu_user();
+	    $toprightmenu .= top_menu_user();
 
-		$toprightmenu.='</div></div>';
+		$toprightmenu .= '</div></div>';
 
-		$toprightmenu.='</div>'."\n";
+		$toprightmenu .= '</div>'."\n";
 
-		$toprightmenu.='<div class="login_block_other">';
+		$toprightmenu .= '<div class="login_block_other">';
 
 		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
-		$parameters=array();
-		$result=$hookmanager->executeHooks('printTopRightMenu', $parameters);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array();
+		$result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
 		if (is_numeric($result))
 		{
 			if ($result == 0)
-				$toprightmenu.=$hookmanager->resPrint;		// add
+				$toprightmenu .= $hookmanager->resPrint; // add
 			else
-				$toprightmenu=$hookmanager->resPrint;						// replace
+				$toprightmenu = $hookmanager->resPrint; // replace
 		}
 		else
 		{
-			$toprightmenu.=$result;	// For backward compatibility
+			$toprightmenu .= $result; // For backward compatibility
 		}
 
 		// Link to module builder
-		if (! empty($conf->modulebuilder->enabled))
+		if (!empty($conf->modulebuilder->enabled))
 		{
-			$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+			$text = '<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-bug atoplogin valignmiddle"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
+			$text .= '<span class="fa fa-bug atoplogin valignmiddle"></span>';
+			$text .= '</a>';
+			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to print main content area
 		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone')
 		{
-			$qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
+			$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
 			if (is_array($_POST))
 			{
-				foreach($_POST as $key=>$value) {
-					if ($key!=='action' && $key!=='password' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+				foreach ($_POST as $key=>$value) {
+					if ($key !== 'action' && $key !== 'password' && !is_array($value)) $qs .= '&'.$key.'='.urlencode($value);
 				}
 			}
-			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
-			$text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+			$qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
+			$text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
 			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-print atoplogin valignmiddle"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
+			$text .= '<span class="fa fa-print atoplogin valignmiddle"></span>';
+			$text .= '</a>';
+			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to Dolibarr wiki pages
@@ -1687,48 +1687,48 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		{
 			$langs->load("help");
 
-			$helpbaseurl='';
-			$helppage='';
-			$mode='';
+			$helpbaseurl = '';
+			$helppage = '';
+			$mode = '';
 
-			if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			if (empty($helppagename)) $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
 
 			// Get helpbaseurl, helppage and mode from helppagename and langs
-			$arrayres=getHelpParamFor($helppagename, $langs);
-			$helpbaseurl=$arrayres['helpbaseurl'];
-			$helppage=$arrayres['helppage'];
-			$mode=$arrayres['mode'];
+			$arrayres = getHelpParamFor($helppagename, $langs);
+			$helpbaseurl = $arrayres['helpbaseurl'];
+			$helppage = $arrayres['helppage'];
+			$mode = $arrayres['mode'];
 
 			// Link to help pages
 			if ($helpbaseurl && $helppage)
 			{
-				$text='';
-	            if(!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
+				$text = '';
+	            if (!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
                     $langs->load('admin');
-                    $appli .= '<br>' . $langs->trans("Database") . ': ' . $db->database_name;
+                    $appli .= '<br>'.$langs->trans("Database").': '.$db->database_name;
                 }
-				$title=$appli.'<br>';
-				$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-				if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
-				$text.='<a class="help" target="_blank" rel="noopener" href="';
-				if ($mode == 'wiki') $text.=sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
-				else $text.=sprintf($helpbaseurl, $helppage);
-				$text.='">';
-				$text.='<span class="fa fa-question-circle atoplogin valignmiddle"></span>';
-				$text.='</a>';
-				$toprightmenu.=@Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
+				$title = $appli.'<br>';
+				$title .= $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
+				if ($mode == 'wiki') $title .= ' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
+				$text .= '<a class="help" target="_blank" rel="noopener" href="';
+				if ($mode == 'wiki') $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
+				else $text .= sprintf($helpbaseurl, $helppage);
+				$text .= '">';
+				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle"></span>';
+				$text .= '</a>';
+				$toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
 		}
 
 
 		// Logout link
-		$toprightmenu.=@Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
+		$toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem logout-btn', 2);
 
-		$toprightmenu.='</div>';
+		$toprightmenu .= '</div>';
 
 		print $toprightmenu;
 
-		print "</div>\n";		// end div class="login_block"
+		print "</div>\n"; // end div class="login_block"
 
 		print '</div></div>';
 
@@ -1752,94 +1752,94 @@ function top_menu_user()
     global $menumanager;
 
     $userImage = $userDropDownImage = '';
-    if (! empty($user->photo))
+    if (!empty($user->photo))
     {
         $userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
         $userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
     }
     else {
-        $nophoto='/public/theme/common/user_anonymous.png';
-        if ($user->gender == 'man') $nophoto='/public/theme/common/user_man.png';
-        if ($user->gender == 'woman') $nophoto='/public/theme/common/user_woman.png';
+        $nophoto = '/public/theme/common/user_anonymous.png';
+        if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
+        if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
 
         $userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
         $userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
     }
 
     $dropdownBody = '';
-    $dropdownBody.= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>';
-    $dropdownBody.= '<div id="topmenuloginmoreinfo" >';
+    $dropdownBody .= '<span id="topmenuloginmoreinfo-btn"><i class="fa fa-caret-right"></i> '.$langs->trans("ShowMoreInfos").'</span>';
+    $dropdownBody .= '<div id="topmenuloginmoreinfo" >';
 
     // login infos
-    if (! empty($user->admin)) {
-        $dropdownBody.= '<br><b>' . $langs->trans("Administrator").'</b>: '.yn($user->admin);
+    if (!empty($user->admin)) {
+        $dropdownBody .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
     }
-    if (! empty($user->socid))	// Add thirdparty for external users
+    if (!empty($user->socid))	// Add thirdparty for external users
     {
         $thirdpartystatic = new Societe($db);
         $thirdpartystatic->fetch($user->socid);
-        $companylink = ' '.$thirdpartystatic->getNomUrl(2);	// picto only of company
-        $company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
+        $companylink = ' '.$thirdpartystatic->getNomUrl(2); // picto only of company
+        $company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
     }
-    $type=($user->socid?$langs->trans("External").$company:$langs->trans("Internal"));
-    $dropdownBody.= '<br><b>' . $langs->trans("Type") . ':</b> ' . $type;
-    $dropdownBody.= '<br><b>' . $langs->trans("Status").'</b>: '.$user->getLibStatut(0);
-    $dropdownBody.= '<br>';
+    $type = ($user->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
+    $dropdownBody .= '<br><b>'.$langs->trans("Type").':</b> '.$type;
+    $dropdownBody .= '<br><b>'.$langs->trans("Status").'</b>: '.$user->getLibStatut(0);
+    $dropdownBody .= '<br>';
 
-    $dropdownBody.= '<br><u>'.$langs->trans("Session").'</u>';
-    $dropdownBody.= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
-    if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody.= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
-    $dropdownBody.= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
-    $dropdownBody.= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
-    $dropdownBody.= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
-    $dropdownBody.= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
-    $dropdownBody.= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
-    $langFlag=picto_from_langcode($langs->getDefaultLang());
-    $dropdownBody.= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag?$langFlag.' ':'').$langs->getDefaultLang();
-    $dropdownBody.= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
-    $dropdownBody.= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
-    $dropdownBody.= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
-    if ($conf->browser->layout == 'phone') $dropdownBody.= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
-    if (! empty($_SESSION["disablemodules"])) $dropdownBody.= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
-    $dropdownBody.= '</div>';
+    $dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';
+    $dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
+    if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
+    $dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
+    $dropdownBody .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
+    $dropdownBody .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+    $dropdownBody .= '<br><b>'.$langs->trans("CurrentTheme").':</b> '.$conf->theme;
+    $dropdownBody .= '<br><b>'.$langs->trans("CurrentMenuManager").':</b> '.$menumanager->name;
+    $langFlag = picto_from_langcode($langs->getDefaultLang());
+    $dropdownBody .= '<br><b>'.$langs->trans("CurrentUserLanguage").':</b> '.($langFlag ? $langFlag.' ' : '').$langs->getDefaultLang();
+    $dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
+    $dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
+    $dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+    if ($conf->browser->layout == 'phone') $dropdownBody .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
+    if (!empty($_SESSION["disablemodules"])) $dropdownBody .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
+    $dropdownBody .= '</div>';
 
     // Execute hook
-    $parameters=array('user'=>$user, 'langs' => $langs);
-    $result=$hookmanager->executeHooks('printTopRightMenuLoginDropdownBody', $parameters);    // Note that $action and $object may have been modified by some hooks
+    $parameters = array('user'=>$user, 'langs' => $langs);
+    $result = $hookmanager->executeHooks('printTopRightMenuLoginDropdownBody', $parameters); // Note that $action and $object may have been modified by some hooks
     if (is_numeric($result))
     {
-        if ($result == 0){
-            $dropdownBody.= $hookmanager->resPrint;		// add
+        if ($result == 0) {
+            $dropdownBody .= $hookmanager->resPrint; // add
         }
-        else{
-            $dropdownBody = $hookmanager->resPrint;		// replace
+        else {
+            $dropdownBody = $hookmanager->resPrint; // replace
         }
     }
 
 
 
-    $logoutLink ='<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
-    $profilLink ='<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
+    $logoutLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php" class="button-top-menu-dropdown" ><i class="fa fa-sign-out-alt"></i> '.$langs->trans("Logout").'</a>';
+    $profilLink = '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" ><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
 
 
     $profilName = $user->getFullName($langs).' ('.$user->login.')';
 
-    if (! empty($user->admin)) {
+    if (!empty($user->admin)) {
         $profilName = '<i class="far fa-star classfortooltip" title="'.$langs->trans("Administrator").'" ></i> '.$profilName;
     }
 
     // Define version to show
-    $appli=constant('DOL_APPLICATION_TITLE');
-    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+    $appli = constant('DOL_APPLICATION_TITLE');
+    if (!empty($conf->global->MAIN_APPLICATION_TITLE))
     {
-    	$appli=$conf->global->MAIN_APPLICATION_TITLE;
+    	$appli = $conf->global->MAIN_APPLICATION_TITLE;
     	if (preg_match('/\d\.\d/', $appli))
     	{
-    		if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
     	}
-    	else $appli.=" ".DOL_VERSION;
+    	else $appli .= " ".DOL_VERSION;
     }
-    else $appli.=" ".DOL_VERSION;
+    else $appli .= " ".DOL_VERSION;
 
     $btnUser = '<!-- div for user link -->
     <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu  inline-block">
@@ -1876,7 +1876,7 @@ function top_menu_user()
         </div>
     </div>';
 
-    if (! defined('JS_JQUERY_DISABLE_DROPDOWN'))    // This may be set by some pages that use different jquery version to avoid errors
+    if (!defined('JS_JQUERY_DISABLE_DROPDOWN'))    // This may be set by some pages that use different jquery version to avoid errors
     {
         $btnUser .= '
         <!-- Code to show/hide the user drop-down -->
@@ -1919,12 +1919,12 @@ function top_menu_bookmark()
 	$html = '';
 
     // Define $bookmarks
-    if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
+    if (!empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
     {
         include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
         $langs->load("bookmarks");
 
-        $html.= '<!-- div for bookmark link -->
+        $html .= '<!-- div for bookmark link -->
         <div id="topmenu-bookmark-dropdown" class="atoplogin dropdown inline-block">
             <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Bookmarks').' ('.$langs->trans('BookmarksMenuShortCut').')">
                 <i class="fa fa-star" ></i>
@@ -1984,49 +1984,49 @@ function top_menu_search()
 
 	$html = '';
 
-    $usedbyinclude=1;
-    $arrayresult=null;
-    include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';	// This set $arrayresult
+    $usedbyinclude = 1;
+    $arrayresult = null;
+    include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
     $defaultAction = '';
-    $buttonList='<div class="dropdown-global-search-button-list" >';
+    $buttonList = '<div class="dropdown-global-search-button-list" >';
     // Menu with all bookmarks
     foreach ($arrayresult as $keyItem => $item)
     {
         if (empty($defaultAction)) {
-            $defaultAction= $item['url'];
+            $defaultAction = $item['url'];
         }
-        $buttonList.='<button class="dropdown-item global-search-item" data-target="'.dol_escape_htmltag($item['url']).'" >';
-        $buttonList.= $item['text'];
-        $buttonList.='</button>';
+        $buttonList .= '<button class="dropdown-item global-search-item" data-target="'.dol_escape_htmltag($item['url']).'" >';
+        $buttonList .= $item['text'];
+        $buttonList .= '</button>';
     }
-    $buttonList.='</div>';
+    $buttonList .= '</div>';
 
 
     $searchInput = '<input name="sall" id="top-global-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Search').'" autocomplete="off" >';
 
 
     $dropDownHtml = '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
-    $dropDownHtml.= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action="'.$defaultAction.'" >';
+    $dropDownHtml .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action="'.$defaultAction.'" >';
 
-    $dropDownHtml.= '
+    $dropDownHtml .= '
         <!-- search input -->
         <div class="dropdown-header search-dropdown-header">
-            ' . $searchInput . '
+            ' . $searchInput.'
         </div>
     ';
 
-    $dropDownHtml.= '
+    $dropDownHtml .= '
         <!-- Menu Body -->
         <div class="dropdown-body search-dropdown-body">
         '.$buttonList.'
         </div>
         ';
 
-    $dropDownHtml.= '</form>';
+    $dropDownHtml .= '</form>';
 
 
-    $html.= '<!-- div for Global Search -->
+    $html .= '<!-- div for Global Search -->
     <div id="topmenu-global-search-dropdown" class="atoplogin dropdown inline-block">
         <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Search').' ('.$langs->trans('SearchMenuShortCut').')">
             <i class="fa fa-search" ></i>
@@ -2114,52 +2114,52 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 	global $user, $conf, $langs, $db, $form;
 	global $hookmanager, $menumanager;
 
-	$searchform='';
-	$bookmarks='';
+	$searchform = '';
+	$bookmarks = '';
 
-	if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	if (!empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
 
-	if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+	if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
 	{
 		// Instantiate hooks of thirdparty module
-		$hookmanager->initHooks(array('searchform','leftblock'));
+		$hookmanager->initHooks(array('searchform', 'leftblock'));
 
 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
-		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;	// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 
 		print "\n";
 
-		if (! is_object($form)) $form=new Form($db);
-		$selected=-1;
-        if(empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
+		if (!is_object($form)) $form = new Form($db);
+		$selected = -1;
+        if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
             $usedbyinclude = 1;
             $arrayresult = null;
-            include DOL_DOCUMENT_ROOT . '/core/ajax/selectsearchbox.php';    // This set $arrayresult
+            include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This set $arrayresult
 
             if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
                 $searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, '', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
             } else {
                 if (is_array($arrayresult)) {
                     foreach ($arrayresult as $key => $val) {
-                        $searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft' . $key, img_picto('', $val['img'], '', false, 1, 1));
+                        $searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, img_picto('', $val['img'], '', false, 1, 1));
                     }
                 }
             }
 
             // Execute hook printSearchForm
             $parameters = array('searchform' => $searchform);
-            $reshook = $hookmanager->executeHooks('printSearchForm', $parameters);    // Note that $action and $object may have been modified by some hooks
+            $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
             if (empty($reshook)) {
                 $searchform .= $hookmanager->resPrint;
             } else $searchform = $hookmanager->resPrint;
 
             // Force special value for $searchform
             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
-                $urltosearch = DOL_URL_ROOT . '/core/search_page.php?showtitlebefore=1';
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="' . $urltosearch . '" accesskey="s" alt="' . dol_escape_htmltag($langs->trans("ShowSearchFields")) . '">' . $langs->trans("Search") . '...</a></div></div>';
+                $urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
             } elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
-                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="' . dol_escape_htmltag($langs->trans("ShowSearchFields")) . '">' . $langs->trans("Search") . '...</a></div><div id="divsearchforms2" style="display: none">' . $searchform . '</div>';
+                $searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
                 $searchform .= '<script>
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
@@ -2172,18 +2172,18 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
         }
 
 		// Define $bookmarks
-		if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire && empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN))
+		if (!empty($conf->bookmark->enabled) && $user->rights->bookmark->lire && empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
 			$langs->load("bookmarks");
 
-			$bookmarks=printBookmarksList();
+			$bookmarks = printBookmarksList();
 		}
 
 		// Left column
 		print '<!-- Begin left menu -->'."\n";
 
-		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
+		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
 
 		// Show left menu with other forms
 		$menumanager->menu_array = $menu_array_before;
@@ -2227,54 +2227,54 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		}
 
 		// Link to bugtrack
-		if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
+		if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
             $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
-			$bugbaseurl.= '&title=';
-			$bugbaseurl.= urlencode("Bug: ");
-            $bugbaseurl.= '&body=';
-            $bugbaseurl.= urlencode("# Instructions\n");
-            $bugbaseurl.= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
-            $bugbaseurl.= urlencode("*Please:*\n");
-            $bugbaseurl.= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
-            $bugbaseurl.= urlencode("- *remove any unused sub-section*\n");
-            $bugbaseurl.= urlencode("\n");
-            $bugbaseurl.= urlencode("\n");
-            $bugbaseurl.= urlencode("# Bug\n");
-            $bugbaseurl.= urlencode("[*Short description*]\n");
-            $bugbaseurl.= urlencode("\n");
-            $bugbaseurl.= urlencode("## Environment\n");
-            $bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
-            $bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
-            $bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-            $bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-            $bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-            $bugbaseurl.= urlencode("- **URL(s)**: " . $_SERVER["REQUEST_URI"] . "\n");
-            $bugbaseurl.= urlencode("\n");
-            $bugbaseurl.= urlencode("## Expected and actual behavior\n");
-            $bugbaseurl.= urlencode("[*Verbose description*]\n");
-            $bugbaseurl.= urlencode("\n");
-            $bugbaseurl.= urlencode("## Steps to reproduce the behavior\n");
-            $bugbaseurl.= urlencode("[*Verbose description*]\n");
-            $bugbaseurl.= urlencode("\n");
-            $bugbaseurl.= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
-            $bugbaseurl.= urlencode("[*Files*]\n");
-            $bugbaseurl.= urlencode("\n");
+			$bugbaseurl .= '&title=';
+			$bugbaseurl .= urlencode("Bug: ");
+            $bugbaseurl .= '&body=';
+            $bugbaseurl .= urlencode("# Instructions\n");
+            $bugbaseurl .= urlencode("*This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*\n");
+            $bugbaseurl .= urlencode("*Please:*\n");
+            $bugbaseurl .= urlencode("- *replace the bracket enclosed texts with meaningful information*\n");
+            $bugbaseurl .= urlencode("- *remove any unused sub-section*\n");
+            $bugbaseurl .= urlencode("\n");
+            $bugbaseurl .= urlencode("\n");
+            $bugbaseurl .= urlencode("# Bug\n");
+            $bugbaseurl .= urlencode("[*Short description*]\n");
+            $bugbaseurl .= urlencode("\n");
+            $bugbaseurl .= urlencode("## Environment\n");
+            $bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+            $bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+            $bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+            $bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+            $bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+            $bugbaseurl .= urlencode("- **URL(s)**: ".$_SERVER["REQUEST_URI"]."\n");
+            $bugbaseurl .= urlencode("\n");
+            $bugbaseurl .= urlencode("## Expected and actual behavior\n");
+            $bugbaseurl .= urlencode("[*Verbose description*]\n");
+            $bugbaseurl .= urlencode("\n");
+            $bugbaseurl .= urlencode("## Steps to reproduce the behavior\n");
+            $bugbaseurl .= urlencode("[*Verbose description*]\n");
+            $bugbaseurl .= urlencode("\n");
+            $bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
+            $bugbaseurl .= urlencode("[*Files*]\n");
+            $bugbaseurl .= urlencode("\n");
 
 
 			// Execute hook printBugtrackInfo
-			$parameters=array('bugbaseurl'=>$bugbaseurl);
-			$reshook=$hookmanager->executeHooks('printBugtrackInfo', $parameters);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('bugbaseurl'=>$bugbaseurl);
+			$reshook = $hookmanager->executeHooks('printBugtrackInfo', $parameters); // Note that $action and $object may have been modified by some hooks
 			if (empty($reshook))
 			{
-				$bugbaseurl.=$hookmanager->resPrint;
+				$bugbaseurl .= $hookmanager->resPrint;
 			}
-			else $bugbaseurl=$hookmanager->resPrint;
+			else $bugbaseurl = $hookmanager->resPrint;
 
-			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("## Report\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Report\n");
 			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
 			print '<a class="help" target="_blank" rel="noopener" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
 			print '</div>';
@@ -2385,32 +2385,32 @@ function getHelpParamFor($helppagename, $langs)
  */
 function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey = '', $prefhtmlinputname = '', $img = '', $showtitlebefore = 0, $autofocus = 0)
 {
-	global $conf,$langs,$user;
+	global $conf, $langs, $user;
 
-	$ret='';
-	$ret.='<form action="'.$urlaction.'" method="post" class="searchform nowraponall tagtr">';
-	$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	$ret.='<input type="hidden" name="mode" value="search">';
-	$ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
-	if ($showtitlebefore) $ret.='<div class="tagtd left">'.$title.'</div> ';
-	$ret.='<div class="tagtd">';
-	$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
-	$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
-	$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
-	$ret.=' placeholder="'.strip_tags($title).'"';
-	$ret.=($autofocus?' autofocus':'');
-	$ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
+	$ret = '';
+	$ret .= '<form action="'.$urlaction.'" method="post" class="searchform nowraponall tagtr">';
+	$ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	$ret .= '<input type="hidden" name="mode" value="search">';
+	$ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
+	if ($showtitlebefore) $ret .= '<div class="tagtd left">'.$title.'</div> ';
+	$ret .= '<div class="tagtd">';
+	$ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
+	$ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+	$ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
+	$ret .= ' placeholder="'.strip_tags($title).'"';
+	$ret .= ($autofocus ? ' autofocus' : '');
+	$ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
 	//$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
-	$ret.='<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
-	$ret.='<span class="fa fa-search"></span>';
-	$ret.='</button>';
-	$ret.='</div>';
-	$ret.="</form>\n";
+	$ret .= '<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
+	$ret .= '<span class="fa fa-search"></span>';
+	$ret .= '</button>';
+	$ret .= '</div>';
+	$ret .= "</form>\n";
 	return $ret;
 }
 
 
-if (! function_exists("llxFooter"))
+if (!function_exists("llxFooter"))
 {
 	/**
 	 * Show HTML footer
@@ -2464,9 +2464,9 @@ if (! function_exists("llxFooter"))
 			unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
-			if (! empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
-			if (! empty($page) && $page > 0)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
-			if (! empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
+			if (!empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
+			if (!empty($page) && $page > 0)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
+			if (!empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
 
 			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_page_'.$relativepathstring]);
@@ -2555,7 +2555,7 @@ if (! function_exists("llxFooter"))
 		{
 			//print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
 			if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
-			|| (! empty($conf->file->instance_unique_id) && (md5($conf->file->instance_unique_id) != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled'))
+			|| (!empty($conf->file->instance_unique_id) && (md5($conf->file->instance_unique_id) != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled'))
 			|| GETPOST('forceping', 'alpha'))
 			{
 				if (empty($_COOKIE['DOLINSTALLNOPING_'.md5($conf->file->instance_unique_id)]))
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index f9a4a12b0df..37c950e9956 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -21,6 +21,10 @@ use Luracast\Restler\RestException;
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
+require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
 
 /**
  * API class for products
@@ -64,17 +68,18 @@ class Products extends DolibarrApi
      *
      * Return an array with product information.
      *
-     * @param  int    $id               ID of product
-     * @param  int    $includestockdata Load also information about stock (slower)
+     * @param  int    $id                  ID of product
+     * @param  int    $includestockdata    Load also information about stock (slower)
+     * @param  bool   $includesubproducts  Load information about subproducts
      * @return array|mixed                 Data without useless information
      *
      * @throws 401
      * @throws 403
      * @throws 404
      */
-    public function get($id, $includestockdata = 0)
+    public function get($id, $includestockdata = 0, $includesubproducts = false)
     {
-        return $this->_fetch($id, '', '', '', $includestockdata);
+        return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts);
     }
 
     /**
@@ -82,20 +87,21 @@ class Products extends DolibarrApi
      *
      * Return an array with product information.
      *
-     * @param string $ref Ref of element
-     * @param int $includestockdata Load also information about stock (slower)
+     * @param  string $ref                Ref of element
+     * @param  int    $includestockdata   Load also information about stock (slower)
+     * @param  bool   $includesubproducts Load information about subproducts
      *
      * @return array|mixed                 Data without useless information
      *
-     * @url GET byRef/{ref}
+     * @url GET ref/{ref}
      *
      * @throws 401
      * @throws 403
      * @throws 404
      */
-    public function getByRef($ref, $includestockdata = 0)
+    public function getByRef($ref, $includestockdata = 0, $includesubproducts = false)
     {
-        return $this->_fetch('', $ref, '', '', $includestockdata);
+        return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts);
     }
 
     /**
@@ -103,20 +109,21 @@ class Products extends DolibarrApi
      *
      * Return an array with product information.
      *
-     * @param string $ref_ext Ref_ext of element
-     * @param int $includestockdata Load also information about stock (slower)
+     * @param  string $ref_ext            Ref_ext of element
+     * @param  int    $includestockdata   Load also information about stock (slower)
+     * @param  bool   $includesubproducts Load information about subproducts
      *
      * @return array|mixed Data without useless information
      *
-     * @url GET byRefExt/{ref_ext}
+     * @url GET ref_ext/{ref_ext}
      *
      * @throws 401
      * @throws 403
      * @throws 404
      */
-    public function getByRefExt($ref_ext, $includestockdata = 0)
+    public function getByRefExt($ref_ext, $includestockdata = 0, $includesubproducts = false)
     {
-        return $this->_fetch('', '', $ref_ext, '', $includestockdata);
+        return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts);
     }
 
     /**
@@ -124,20 +131,21 @@ class Products extends DolibarrApi
      *
      * Return an array with product information.
      *
-     * @param string $barcode Barcode of element
-     * @param int $includestockdata Load also information about stock (slower)
+     * @param  string $barcode            Barcode of element
+     * @param  int    $includestockdata   Load also information about stock (slower)
+     * @param  bool   $includesubproducts Load information about subproducts
      *
      * @return array|mixed Data without useless information
      *
-     * @url GET byBarcode/{barcode}
+     * @url GET barcode/{barcode}
      *
      * @throws 401
      * @throws 403
      * @throws 404
      */
-    public function getByBarcode($barcode, $includestockdata = 0)
+    public function getByBarcode($barcode, $includestockdata = 0, $includesubproducts = false)
     {
-        return $this->_fetch('', '', '', $barcode, $includestockdata);
+        return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts);
     }
 
     /**
@@ -370,6 +378,105 @@ class Products extends DolibarrApi
         return $this->product->delete(DolibarrApiAccess::$user);
     }
 
+    /**
+     * Get the list of subproducts of the product.
+     *
+     * @param  int $id      Id of parent product/service
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     * @throws 404
+     *
+     * @url GET {id}/subproducts
+     */
+    public function getSubproducts($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        if(! DolibarrApi::_checkAccessToResource('product', $id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $childsArbo = $this->product->getChildsArbo($id, 1);
+
+        $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
+        $childs = [];
+        foreach ($childsArbo as $values) {
+            $childs[] = array_combine($keys, $values);
+        }
+
+        return $childs;
+    }
+
+    /**
+     * Add subproduct.
+     *
+     * Link a product/service to a parent product/service
+     *
+     * @param  int $id            Id of parent product/service
+     * @param  int $subproduct_id Id of child product/service
+     * @param  int $qty           Quantity
+     * @param  int $incdec        1=Increase/decrease stock of child when parent stock increase/decrease
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     * @throws 404
+     *
+     * @url POST {id}/subproducts/add
+     */
+    public function addSubproducts($id, $subproduct_id, $qty, $incdec = 1)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->creer) {
+            throw new RestException(401);
+        }
+
+        if(! DolibarrApi::_checkAccessToResource('product', $id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->product->add_sousproduit($id, $subproduct_id, $qty, $incdec);
+        if ($result <= 0) {
+            throw new RestException(500, "Error adding product child");
+        }
+        return $result;
+    }
+
+    /**
+     * Remove subproduct.
+     *
+     *  Unlink a product/service from a parent product/service
+     *
+     * @param  int $id             Id of parent product/service
+     * @param  int $subproduct_id  Id of child product/service
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     * @throws 404
+     *
+     * @url DELETE {id}/subproducts/remove
+     */
+    public function delSubproducts($id, $subproduct_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->creer) {
+            throw new RestException(401);
+        }
+
+        if(! DolibarrApi::_checkAccessToResource('product', $id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->product->del_sousproduit($id, $subproduct_id);
+        if ($result <= 0) {
+            throw new RestException(500, "Error while removing product child");
+        }
+        return $result;
+    }
+
 
     /**
      * Get categories for a product
@@ -696,6 +803,713 @@ class Products extends DolibarrApi
         return $this->_cleanObjectDatas($this->productsupplier);
     }
 
+    /**
+     * Get attributes.
+     *
+     * @return array
+     *
+     * @throws RestException
+     *
+     * @url GET attributes
+     */
+    public function getAttributes()
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        $prodattr = new ProductAttribute($this->db);
+        return $prodattr->fetchAll();
+    }
+
+    /**
+     * Get attribute by ID.
+     *
+     * @param  int $id ID of Attribute
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     * @throws 404
+     *
+     * @url GET attributes/{id}
+     */
+    public function getAttributeById($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        $prodattr = new ProductAttribute($this->db);
+        $result = $prodattr->fetch((int) $id);
+
+        if($result < 0) {
+            throw new RestException(404, "Attribute not found");
+        }
+
+        return $prodattr;
+    }
+
+    /**
+     * Get attributes by ref.
+     *
+     * @param  string $ref Reference of Attribute
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url GET attributes/ref/{ref}
+     */
+    public function getAttributesByRef($ref)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '". trim($ref) ."' AND entity IN (".getEntity('product').")";
+
+        $query = $this->db->query($sql);
+
+        if (!$this->db->num_rows($query)) {
+            throw new RestException(404);
+        }
+
+        $result = $this->db->fetch_object($query);
+
+        $attr = [];
+        $attr['id'] = $result->rowid;
+        $attr['ref'] = $result->ref;
+        $attr['label'] = $result->label;
+        $attr['rang'] = $result->rang;
+
+        return $attr;
+    }
+
+    /**
+     * Add attributes.
+     *
+     * @param  string $ref   Reference of Attribute
+     * @param  string $label Label of Attribute
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url POST attributes
+     */
+    public function addAttributes($ref, $label)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->creer) {
+            throw new RestException(401);
+        }
+
+        $prodattr = new ProductAttribute($this->db);
+        $prodattr->label = $label;
+        $prodattr->ref = $ref;
+
+        $resid = $prodattr->create(DolibarrApiAccess::$user);
+        if ($resid <= 0) {
+            throw new RestException(500, "Error creating new attribute");
+        }
+        return $resid;
+    }
+
+    /**
+     * Update attributes by id.
+     *
+     * @param  int $id    ID of Attribute
+     * @param  array $request_data Datas
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     * @throws 404
+     *
+     * @url PUT attributes/{id}
+     */
+    public function putAttributes($id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->creer) {
+            throw new RestException(401);
+        }
+
+        $prodattr = new ProductAttribute($this->db);
+
+        $result = $prodattr->fetch((int) $id);
+        if ($result == 0) {
+            throw new RestException(404, 'Attribute not found');
+        } elseif ($result < 0) {
+            throw new RestException(500, "Error fetching attribute");
+        }
+
+        foreach($request_data as $field => $value) {
+            if ($field == 'rowid') { continue;
+            }
+            $prodattr->$field = $value;
+        }
+
+        if ($prodattr->update(DolibarrApiAccess::$user) > 0) {
+            $result = $prodattr->fetch((int) $id);
+            if ($result == 0) {
+                throw new RestException(404, 'Attribute not found');
+            } elseif ($result < 0) {
+                throw new RestException(500, "Error fetching attribute");
+            } else {
+                return $prodattr;
+            }
+        }
+        throw new RestException(500, "Error updating attribute");
+    }
+
+    /**
+     * Delete attributes by id.
+     *
+     * @param  int $id ID of Attribute
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url DELETE attributes/{id}
+     */
+    public function deleteAttributes($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->supprimer) {
+            throw new RestException(401);
+        }
+
+        $prodattr = new ProductAttribute($this->db);
+        $prodattr->id = (int) $id;
+        $result = $prodattr->delete();
+
+        if ($result > 0) {
+            return 1;
+        }
+        throw new RestException(500, "Error deleting attribute");
+    }
+
+    /**
+     * Get attribute value by id.
+     *
+     * @param  int $id ID of Attribute value
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url GET attributes/values/{id}
+     */
+    public function getAttributeValueById($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
+
+        $query = $this->db->query($sql);
+
+        if (!$query) {
+            throw new RestException(401);
+        }
+
+        if (!$this->db->num_rows($query)) {
+            throw new RestException(404, 'Attribute value not found');
+        }
+
+        $result = $this->db->fetch_object($query);
+
+        $attrval = [];
+        $attrval['id'] = $result->rowid;
+        $attrval['fk_product_attribute'] = $result->fk_product_attribute;
+        $attrval['ref'] = $result->ref;
+        $attrval['value'] = $result->value;
+
+        return $attrval;
+    }
+
+    /**
+     * Get attribute value by ref.
+     *
+     * @param  int $id ID of Attribute value
+     * @param  string $ref Ref of Attribute value
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url GET attributes/{id}/values/ref/{ref}
+     */
+    public function getAttributeValueByRef($id, $ref)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '". trim($ref) ."' AND fk_product_attribute = ". (int) $id ." AND entity IN (".getEntity('product').")";
+
+        $query = $this->db->query($sql);
+
+        if (!$query) {
+            throw new RestException(401);
+        }
+
+        if (!$this->db->num_rows($query)) {
+            throw new RestException(404, 'Attribute value not found');
+        }
+
+        $result = $this->db->fetch_object($query);
+
+        $attrval = [];
+        $attrval['id'] = $result->rowid;
+        $attrval['fk_product_attribute'] = $result->fk_product_attribute;
+        $attrval['ref'] = $result->ref;
+        $attrval['value'] = $result->value;
+
+        return $attrval;
+    }
+
+    /**
+     * Delete attribute value by ref.
+     *
+     * @param  int $id ID of Attribute
+     * @param  string $ref Ref of Attribute value
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url DELETE attributes/{id}/values/ref/{ref}
+     */
+    public function deleteAttributeValueByRef($id, $ref)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->supprimer) {
+            throw new RestException(401);
+        }
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '". trim($ref) ."' AND fk_product_attribute = ". (int) $id;
+
+        if ($this->db->query($sql)) {
+            return 1;
+        }
+
+        throw new RestException(500, "Error deleting attribute value");
+    }
+
+    /**
+     * Get all values for an attribute id.
+     *
+     * @param  int $id ID of an Attribute
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url GET attributes/{id}/values
+     */
+    public function getAttributeValues($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        $objectval = new ProductAttributeValue($this->db);
+        return $objectval->fetchAllByProductAttribute((int) $id);
+    }
+
+    /**
+     * Get all values for an attribute ref.
+     *
+     * @param  string $ref Ref of an Attribute
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url GET attributes/ref/{ref}/values
+     */
+    public function getAttributeValuesByRef($ref)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        $return = array();
+
+        $sql = 'SELECT ';
+        $sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value v ';
+        $sql .= "WHERE v.fk_product_attribute = ( SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '". strtoupper(trim($ref)) ."' LIMIT 1)";
+
+        $query = $this->db->query($sql);
+
+        while ($result = $this->db->fetch_object($query)) {
+            $tmp = new ProductAttributeValue($this->db);
+            $tmp->fk_product_attribute = $result->fk_product_attribute;
+            $tmp->id = $result->rowid;
+            $tmp->ref = $result->ref;
+            $tmp->value = $result->value;
+
+            $return[] = $tmp;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Add attribute value.
+     *
+     * @param  int    $id    ID of Attribute
+     * @param  string $ref   Reference of Attribute value
+     * @param  string $value Value of Attribute value
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url POST attributes/{id}/values
+     */
+    public function addAttributeValue($id, $ref, $value)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->creer) {
+            throw new RestException(401);
+        }
+
+        if (empty($ref) || empty($value)) {
+            throw new RestException(401);
+        }
+
+        $objectval = new ProductAttributeValue($this->db);
+        $objectval->fk_product_attribute = $id;
+        $objectval->ref = $ref;
+        $objectval->value = $value;
+
+        if ($objectval->create(DolibarrApiAccess::$user) > 0) {
+            return $objectval->id;
+        }
+        throw new RestException(500, "Error creating new attribute value");
+    }
+
+    /**
+     * Update attribute value.
+     *
+     * @param  int $id ID of Attribute
+     * @param  array $request_data Datas
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url PUT attributes/values/{id}
+     */
+    public function putAttributeValue($id, $request_data)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->creer) {
+            throw new RestException(401);
+        }
+
+        $objectval = new ProductAttributeValue($this->db);
+        $result = $objectval->fetch((int) $id);
+
+        if ($result == 0) {
+            throw new RestException(404, 'Attribute value not found');
+        } elseif ($result < 0) {
+            throw new RestException(500, "Error fetching attribute value");
+        }
+
+        foreach($request_data as $field => $value) {
+            if ($field == 'rowid') { continue;
+            }
+            $objectval->$field = $value;
+        }
+
+        if ($objectval->update(DolibarrApiAccess::$user) > 0) {
+            $result = $objectval->fetch((int) $id);
+            if ($result == 0) {
+                throw new RestException(404, 'Attribute not found');
+            } elseif ($result < 0) {
+                throw new RestException(500, "Error fetching attribute");
+            } else {
+                return $objectval;
+            }
+        }
+        throw new RestException(500, "Error updating attribute");
+    }
+
+    /**
+     * Delete attribute value by id.
+     *
+     * @param  int $id ID of Attribute value
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url DELETE attributes/values/{id}
+     */
+    public function deleteAttributeValueById($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->supprimer) {
+            throw new RestException(401);
+        }
+
+        $objectval = new ProductAttributeValue($this->db);
+        $objectval->id = (int) $id;
+
+        if ($objectval->delete() > 0) {
+            return 1;
+        }
+        throw new RestException(500, "Error deleting attribute value");
+    }
+
+    /**
+     * Get product variants.
+     *
+     * @param  int $id ID of Product
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url GET {id}/variants
+     */
+    public function getVariants($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        $prodcomb = new ProductCombination($this->db);
+        $combinations = $prodcomb->fetchAllByFkProductParent((int) $id);
+
+        foreach ($combinations as $key => $combination) {
+            $prodc2vp = new ProductCombination2ValuePair($this->db);
+            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
+        }
+
+        return $combinations;
+    }
+
+    /**
+     * Get product variants by Product ref.
+     *
+     * @param  string $ref Ref of Product
+     * @return array
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url GET ref/{ref}/variants
+     */
+    public function getVariantsByProdRef($ref)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->lire) {
+            throw new RestException(401);
+        }
+
+        $result = $this->product->fetch('', $ref);
+        if(! $result ) {
+            throw new RestException(404, 'Product not found');
+        }
+
+        $prodcomb = new ProductCombination($this->db);
+        $combinations = $prodcomb->fetchAllByFkProductParent((int) $this->product->id);
+
+        foreach ($combinations as $key => $combination) {
+            $prodc2vp = new ProductCombination2ValuePair($this->db);
+            $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
+        }
+
+        return $combinations;
+    }
+
+    /**
+     * Add variant.
+     *
+     * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+     *
+     * @param  int    $id                       ID of Product
+     * @param  float  $weight_impact            Weight impact of variant
+     * @param  float  $price_impact             Price impact of variant
+     * @param  bool   $price_impact_is_percent  Price impact in percent (true or false)
+     * @param  array  $features                 List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     * @throws 404
+     *
+     * @url POST {id}/variants
+     */
+    public function addVariant($id, $weight_impact, $price_impact, $price_impact_is_percent, $features)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->creer) {
+            throw new RestException(401);
+        }
+
+        if (empty($id) || empty($features) || !is_array($features)) {
+            throw new RestException(401);
+        }
+
+        $weight_impact = price2num($weight_impact);
+        $price_impact = price2num($price_impact);
+
+        $prodattr = new ProductAttribute($this->db);
+        $prodattr_val = new ProductAttributeValue($this->db);
+        foreach ($features as $id_attr => $id_value) {
+            if ($prodattr->fetch((int) $id_attr) < 0) {
+                throw new RestException(401);
+            }
+            if ($prodattr_val->fetch((int) $id_value) < 0) {
+                throw new RestException(401);
+            }
+        }
+
+        $result = $this->product->fetch((int) $id);
+        if(! $result ) {
+            throw new RestException(404, 'Product not found');
+        }
+
+        $prodcomb = new ProductCombination($this->db);
+        if (! $prodcomb->fetchByProductCombination2ValuePairs($id, $features))
+        {
+            $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact);
+            if ($result > 0)
+            {
+                return $result;
+            } else {
+                throw new RestException(500, "Error creating new product variant");
+            }
+        } else {
+            return $prodcomb->id;
+        }
+    }
+
+    /**
+     * Add variant by product ref.
+     *
+     * "features" is a list of attributes pairs id_attribute=>id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+     *
+     * @param  string $ref                      Ref of Product
+     * @param  float  $weight_impact            Weight impact of variant
+     * @param  float  $price_impact             Price impact of variant
+     * @param  bool   $price_impact_is_percent  Price impact in percent (true or false)
+     * @param  array  $features                 List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     * @throws 404
+     *
+     * @url POST ref/{ref}/variants
+     */
+    public function addVariantByProductRef($ref, $weight_impact, $price_impact, $price_impact_is_percent, $features)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->creer) {
+            throw new RestException(401);
+        }
+
+        if (empty($ref) || empty($features) || !is_array($features)) {
+            throw new RestException(401);
+        }
+
+        $weight_impact = price2num($weight_impact);
+        $price_impact = price2num($price_impact);
+
+        $prodattr = new ProductAttribute($this->db);
+        $prodattr_val = new ProductAttributeValue($this->db);
+        foreach ($features as $id_attr => $id_value) {
+            if ($prodattr->fetch((int) $id_attr) < 0) {
+                throw new RestException(404);
+            }
+            if ($prodattr_val->fetch((int) $id_value) < 0) {
+                throw new RestException(404);
+            }
+        }
+
+        $result = $this->product->fetch('', trim($ref));
+        if(! $result ) {
+            throw new RestException(404, 'Product not found');
+        }
+
+        $prodcomb = new ProductCombination($this->db);
+        if (! $prodcomb->fetchByProductCombination2ValuePairs($this->product->id, $features))
+        {
+            $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact);
+            if ($result > 0)
+            {
+                return $result;
+            } else {
+                throw new RestException(500, "Error creating new product variant");
+            }
+        } else {
+            return $prodcomb->id;
+        }
+    }
+
+    /**
+     * Put product variants.
+     *
+     * @param  int $id ID of Variant
+     * @param  array $request_data Datas
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url PUT variants/{id}
+     */
+    public function putVariant($id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->creer) {
+            throw new RestException(401);
+        }
+
+        $prodcomb = new ProductCombination($this->db);
+        $prodcomb->fetch((int) $id);
+
+        foreach($request_data as $field => $value) {
+            if ($field == 'rowid') { continue;
+            }
+            $prodcomb->$field = $value;
+        }
+
+        $result = $prodcomb->update(DolibarrApiAccess::$user);
+        if ($result > 0)
+        {
+            return 1;
+        }
+        throw new RestException(500, "Error editing variant");
+    }
+
+    /**
+     * Delete product variants.
+     *
+     * @param  int $id ID of Variant
+     * @return int
+     *
+     * @throws RestException
+     * @throws 401
+     *
+     * @url DELETE variants/{id}
+     */
+    public function deleteVariant($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->produit->supprimer) {
+            throw new RestException(401);
+        }
+
+        $prodcomb = new ProductCombination($this->db);
+        $prodcomb->id = (int) $id;
+        $result = $prodcomb->delete(DolibarrApiAccess::$user);
+        return $result;
+        if ($result > 0)
+        {
+            return 1;
+        }
+        throw new RestException(500, "Error deleting variant");
+    }
+
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
@@ -748,18 +1562,19 @@ class Products extends DolibarrApi
      *
      * Return an array with product information.
      *
-     * @param  int    $id               ID of product
-     * @param  string $ref              Ref of element
-     * @param  string $ref_ext          Ref ext of element
-     * @param  string $barcode          Barcode of element
-     * @param  int    $includestockdata Load also information about stock (slower)
-     * @return array|mixed                 Data without useless information
+     * @param  int    $id                 ID of product
+     * @param  string $ref                Ref of element
+     * @param  string $ref_ext            Ref ext of element
+     * @param  string $barcode            Barcode of element
+     * @param  int    $includestockdata   Load also information about stock (slower)
+     * @param  bool   $includesubproducts Load information about subproducts
+     * @return array|mixed                Data without useless information
      *
      * @throws 401
      * @throws 403
      * @throws 404
      */
-    private function _fetch($id, $ref = '', $ref_ext = '', $barcode = '', $includestockdata = 0)
+    private function _fetch($id, $ref = '', $ref_ext = '', $barcode = '', $includestockdata = 0, $includesubproducts = false)
     {
         if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
             throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
@@ -784,6 +1599,20 @@ class Products extends DolibarrApi
                $this->product->load_stock();
         }
 
+
+
+        if ($includesubproducts) {
+            $childsArbo = $this->product->getChildsArbo($id, 1);
+
+            $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
+            $childs = [];
+            foreach ($childsArbo as $values) {
+                $childs[] = array_combine($keys, $values);
+            }
+
+            $this->product->sousprods = $childs;
+        }
+
         return $this->_cleanObjectDatas($this->product);
     }
 }
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 1d8b709f662..d3a647adfcf 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -89,7 +89,9 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 {
     $virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
 }
-$usevirtualstock = 0;
+
+$usevirtualstock = !empty($conf->global->STOCK_USE_VIRTUAL_STOCK);
+if ($mode == 'physical') $usevirtualstock = 0;
 if ($mode == 'virtual') $usevirtualstock = 1;
 
 $parameters = array();
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index c39f498d9b6..5ca7debbef6 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -38,8 +38,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array('products', 'stocks', 'orders'));
 
 // Security check
-if ($user->socid) $socid=$user->socid;
-$result=restrictedArea($user, 'produit|service');
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'produit|service');
 
 $sall = GETPOST('search_all', 'alphanohtml');
 $sref = GETPOST('search_ref', 'alpha');
@@ -53,7 +53,7 @@ $search_datemonth = GETPOST('search_datemonth', 'int');
 $search_dateday = GETPOST('search_dateday', 'int');
 $search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
 
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 if (!$sortorder) $sortorder = 'DESC';
@@ -69,16 +69,16 @@ $offset = $limit * $page;
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $sall="";
-    $sref="";
-    $snom="";
-    $suser="";
-    $sttc="";
-    $search_date='';
-    $search_datemonth='';
-    $search_dateday='';
-    $search_dateyear='';
-    $sproduct=0;
+    $sall = "";
+    $sref = "";
+    $snom = "";
+    $suser = "";
+    $sttc = "";
+    $search_date = '';
+    $search_datemonth = '';
+    $search_dateday = '';
+    $search_dateyear = '';
+    $sproduct = 0;
 }
 
 
@@ -109,40 +109,40 @@ dol_fiche_head($head, 'replenishorders', '', -1, '');
 $commandestatic = new CommandeFournisseur($db);
 
 $sql = 'SELECT s.rowid as socid, s.nom as name, cf.date_creation as dc,';
-$sql.= ' cf.rowid, cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author,';
-$sql.= ' u.login';
-$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande_fournisseur as cf';
-$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON cf.fk_user_author = u.rowid';
+$sql .= ' cf.rowid, cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author,';
+$sql .= ' u.login';
+$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande_fournisseur as cf';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON cf.fk_user_author = u.rowid';
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql.= ', ' . MAIN_DB_PREFIX . 'societe_commerciaux as sc';
+    $sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
 }
-$sql.= ' WHERE cf.fk_soc = s.rowid ';
-$sql.= ' AND cf.entity = ' . $conf->entity;
+$sql .= ' WHERE cf.fk_soc = s.rowid ';
+$sql .= ' AND cf.entity = '.$conf->entity;
 if ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) {
     $sql .= ' AND cf.fk_statut < 3';
-} elseif ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
-    $sql .= ' AND cf.fk_statut < 6';	// We want also status 5, we will keep them visible if dispatching is not yet finished (tested with function dolDispatchToDo).
+} elseif ($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
+    $sql .= ' AND cf.fk_statut < 6'; // We want also status 5, we will keep them visible if dispatching is not yet finished (tested with function dolDispatchToDo).
 } else {
     $sql .= ' AND cf.fk_statut < 5';
 }
 if (!$user->rights->societe->client->voir && !$socid) {
-    $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = ' . $user->id;
+    $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
 }
 if ($sref) $sql .= natural_search('cf.ref', $sref);
 if ($snom) $sql .= natural_search('s.nom', $snom);
 if ($suser) $sql .= natural_search('u.login', $suser);
 if ($sttc) $sql .= natural_search('cf.total_ttc', $sttc, 1);
-$sql.= dolSqlDateFilter('cf.date_creation', $search_dateday, $search_datemonth, $search_dateyear);
-if ($sall) $sql .= natural_search(array('cf.ref','cf.note'), $sall);
-if (!empty($socid)) $sql .= ' AND s.rowid = ' . $socid;
+$sql .= dolSqlDateFilter('cf.date_creation', $search_dateday, $search_datemonth, $search_dateyear);
+if ($sall) $sql .= natural_search(array('cf.ref', 'cf.note'), $sall);
+if (!empty($socid)) $sql .= ' AND s.rowid = '.$socid;
 if (GETPOST('statut', 'int')) {
-    $sql .= ' AND fk_statut = ' . GETPOST('statut', 'int');
+    $sql .= ' AND fk_statut = '.GETPOST('statut', 'int');
 }
 $sql .= ' GROUP BY cf.rowid, cf.ref, cf.date_creation, cf.fk_statut';
 $sql .= ', cf.total_ttc, cf.fk_user_author, u.login, s.rowid, s.nom';
 $sql .= $db->order($sortfield, $sortorder);
-if (! $sproduct) {
-	$sql .= $db->plimit($limit+1, $offset);
+if (!$sproduct) {
+	$sql .= $db->plimit($limit + 1, $offset);
 }
 
 $resql = $db->query($sql);
@@ -155,17 +155,17 @@ if ($resql)
 
     print_barre_liste('', $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', $num, 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 ($sref) $param.='&search_ref='.urlencode($sref);
-    if ($snom) $param.='&search_nom='.urlencode($snom);
-    if ($suser) $param.='&search_user='.urlencode($suser);
-    if ($sttc) $param.='&search_ttc='.urlencode($sttc);
-    if ($search_dateyear) $param.='&search_dateyear='.urlencode($search_dateyear);
-    if ($search_datemonth) $param.='&search_datemonth='.urlencode($search_datemonth);
-    if ($search_dateday) $param.='&search_dateday='.urlencode($search_dateday);
-    if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
+    $param = '';
+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+    if ($sref) $param .= '&search_ref='.urlencode($sref);
+    if ($snom) $param .= '&search_nom='.urlencode($snom);
+    if ($suser) $param .= '&search_user='.urlencode($suser);
+    if ($sttc) $param .= '&search_ttc='.urlencode($sttc);
+    if ($search_dateyear) $param .= '&search_dateyear='.urlencode($search_dateyear);
+    if ($search_datemonth) $param .= '&search_datemonth='.urlencode($search_datemonth);
+    if ($search_dateday) $param .= '&search_dateday='.urlencode($search_dateday);
+    if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 
 
     print '<form action="'.$_SERVER["PHP_SELF"].'" method="GET">';
@@ -174,16 +174,16 @@ if ($resql)
 
     print '<tr class="liste_titre_filter">';
     print '<td class="liste_titre">'.
-         '<input type="text" class="flat" name="search_ref" value="' . dol_escape_htmltag($sref) . '">'.
+         '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($sref).'">'.
          '</td>'.
          '<td class="liste_titre">'.
-         '<input type="text" class="flat" name="search_nom" value="' . dol_escape_htmltag($snom) . '">'.
+         '<input type="text" class="flat" name="search_nom" value="'.dol_escape_htmltag($snom).'">'.
          '</td>'.
          '<td class="liste_titre">'.
-         '<input type="text" class="flat" name="search_user" value="' . dol_escape_htmltag($suser) . '">'.
+         '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">'.
          '</td>'.
          '<td class="liste_titre">'.
-         '<input type="text" class="flat" name="search_ttc" value="' . dol_escape_htmltag($sttc) . '">'.
+         '<input type="text" class="flat" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">'.
          '</td>'.
          '<td class="liste_titre">'.
          $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '').
@@ -260,7 +260,7 @@ if ($resql)
 
     $userstatic = new User($db);
 
-	while ($i < min($num, $sproduct?$num:$conf->liste_limit))
+	while ($i < min($num, $sproduct ? $num : $conf->liste_limit))
     {
         $obj = $db->fetch_object($resql);
 
@@ -276,11 +276,11 @@ if ($resql)
             print '</td>';
 
             // Company
-            $href = DOL_URL_ROOT . '/fourn/card.php?socid=' . $obj->socid;
+            $href = DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid;
             print '<td>'.
-                 '<a href="' . $href .'">'.
-                 img_object($langs->trans('ShowCompany'), 'company'). ' '.
-                 $obj->name . '</a></td>';
+                 '<a href="'.$href.'">'.
+                 img_object($langs->trans('ShowCompany'), 'company').' '.
+                 $obj->name.'</a></td>';
 
             // Author
             $userstatic->id = $obj->fk_user_author;
@@ -288,7 +288,7 @@ if ($resql)
             if ($userstatic->id) {
                 $txt = $userstatic->getLoginUrl(1);
             } else {
-                $txt =  '&nbsp;';
+                $txt = '&nbsp;';
             }
             print '<td>'.$txt.'</td>';
             // Amount
@@ -296,9 +296,9 @@ if ($resql)
 
             // Date
             if ($obj->dc) {
-                $date =  dol_print_date($db->jdate($obj->dc), 'dayhour');
+                $date = dol_print_date($db->jdate($obj->dc), 'dayhour');
             } else {
-                $date =  '-';
+                $date = '-';
             }
             print '<td>'.$date.'</td>';
             // Statut
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index e814bdfaac0..816d97351b4 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -30,19 +30,19 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 $langs->load("stocks");
 
 // Security check
-$result=restrictedArea($user, 'stock');
+$result = restrictedArea($user, 'stock');
 
-$sref=GETPOST("sref", 'alpha');
-$snom=GETPOST("snom", 'alpha');
-$sall=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
+$sref = GETPOST("sref", 'alpha');
+$snom = GETPOST("snom", 'alpha');
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
-if (! $sortfield) $sortfield="e.ref";
-if (! $sortorder) $sortorder="ASC";
+if (!$sortfield) $sortfield = "e.ref";
+if (!$sortorder) $sortorder = "ASC";
 $page = $_GET["page"];
 if ($page < 0) $page = 0;
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $year = strftime("%Y", time());
@@ -53,23 +53,23 @@ $year = strftime("%Y", time());
  */
 
 $sql = "SELECT e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays,";
-$sql.= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
-$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
-$sql.= " WHERE e.entity IN (".getEntity('stock').")";
-if ($sref) $sql.= natural_search("e.ref", $sref);
+$sql .= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
+$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON e.rowid = ps.fk_entrepot";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON ps.fk_product = p.rowid";
+$sql .= " WHERE e.entity IN (".getEntity('stock').")";
+if ($sref) $sql .= natural_search("e.ref", $sref);
 if ($sall)
 {
-    $sql.= " AND (e.ref LIKE '%".$db->escape($sall)."%'";
-    $sql.= " OR e.description LIKE '%".$db->escape($sall)."%'";
-    $sql.= " OR e.lieu LIKE '%".$db->escape($sall)."%'";
-    $sql.= " OR e.address LIKE '%".$db->escape($sall)."%'";
-    $sql.= " OR e.town LIKE '%".$db->escape($sall)."%')";
+    $sql .= " AND (e.ref LIKE '%".$db->escape($sall)."%'";
+    $sql .= " OR e.description LIKE '%".$db->escape($sall)."%'";
+    $sql .= " OR e.lieu LIKE '%".$db->escape($sall)."%'";
+    $sql .= " OR e.address LIKE '%".$db->escape($sall)."%'";
+    $sql .= " OR e.town LIKE '%".$db->escape($sall)."%')";
 }
-$sql.= " GROUP BY e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
-$sql.= $db->order($sortfield, $sortorder);
-$sql.= $db->plimit($limit + 1, $offset);
+$sql .= " GROUP BY e.rowid, e.ref, e.statut, e.lieu, e.address, e.zip, e.town, e.fk_pays";
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
 if ($result)
@@ -78,7 +78,7 @@ if ($result)
 
     $i = 0;
 
-    $help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
+    $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
     llxHeader("", $langs->trans("EnhancedValueOfWarehouses"), $help_url);
 
     print_barre_liste($langs->trans("EnhancedValueOfWarehouses"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num);
@@ -94,9 +94,9 @@ if ($result)
 
     if ($num)
     {
-        $entrepot=new Entrepot($db);
+        $entrepot = new Entrepot($db);
         $total = $totalsell = 0;
-        $var=false;
+        $var = false;
         while ($i < min($num, $limit))
         {
             $objp = $db->fetch_object($result);
@@ -136,17 +136,17 @@ if ($result)
 
     print '<br>';
 
-    $file='entrepot-'.$year.'.png';
+    $file = 'entrepot-'.$year.'.png';
     if (file_exists($conf->stock->dir_temp.'/'.$file))
     {
-        $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
+        $url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
         print '<img src="'.$url.'">';
     }
 
-    $file='entrepot-'.($year-1).'.png';
+    $file = 'entrepot-'.($year - 1).'.png';
     if (file_exists($conf->stock->dir_temp.'/'.$file))
     {
-        $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
+        $url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
         print '<br><img src="'.$url.'">';
     }
 }
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index bc122367312..60657b08061 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1985,7 +1985,7 @@ class Task extends CommonObject
 		$sql .= " WHERE p.entity IN (".getEntity('project', 0).')';
 		$sql .= " AND p.fk_statut = 1";
 		$sql .= " AND t.fk_projet = p.rowid";
-		$sql .= " AND t.progress < 100"; // tasks to do
+		$sql .= " AND (t.progress IS NULL OR t.progress < 100)"; // tasks to do
 		if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")";
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index c28460e1045..ddb7673dece 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -36,34 +36,34 @@ $ref    = GETPOST('ref', 'alpha');
 $socid  = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "alpha");
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
-if (! $sortfield) $sortfield="a.datep,a.id";
-if (! $sortorder) $sortorder="DESC";
-$offset = $limit * $page ;
+if (!$sortfield) $sortfield = "a.datep,a.id";
+if (!$sortorder) $sortorder = "DESC";
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 if (GETPOST('actioncode', 'array'))
 {
-	$actioncode=GETPOST('actioncode', 'array', 3);
-	if (! count($actioncode)) $actioncode='0';
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
 }
 else
 {
-	$actioncode=GETPOST("actioncode", "alpha", 3)?GETPOST("actioncode", "alpha", 3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
-$search_agenda_label=GETPOST('search_agenda_label');
+$search_agenda_label = GETPOST('search_agenda_label');
 
 // Security check
 $id = GETPOST("id", 'int');
-$socid=0;
+$socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-$result=restrictedArea($user, 'projet', $id, '');
+$result = restrictedArea($user, 'projet', $id, '');
 
 if (!$user->rights->projet->lire)	accessforbidden();
 
@@ -149,20 +149,20 @@ dol_fiche_end();
 
 // Actions buttons
 
-$out='';
-$permok=$user->rights->agenda->myactions->create;
+$out = '';
+$permok = $user->rights->agenda->myactions->create;
 if ($permok)
 {
-    $out.='&projectid='.$object->id;
+    $out .= '&projectid='.$object->id;
 }
 
 
 //print '<div class="tabsAction">';
-$morehtmlcenter='';
-if (! empty($conf->agenda->enabled))
+$morehtmlcenter = '';
+if (!empty($conf->agenda->enabled))
 {
-    $addActionBtnRight = ! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create);
-    $morehtmlcenter.= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
+    $addActionBtnRight = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
+    $morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
 }
 
 //print '</div>';
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index e1bf458b6e4..d0f85eb9fe2 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -50,56 +50,56 @@ $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
-if (! is_array($search_array_options)) $search_array_options = array();
-$search_ref=GETPOST("search_ref");
-$search_type=GETPOST("search_type");
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+if (!is_array($search_array_options)) $search_array_options = array();
+$search_ref = GETPOST("search_ref");
+$search_type = GETPOST("search_type");
 
-$filter=array();
+$filter = array();
 
-if ($search_ref != ''){
-	$param.='&search_ref='.$search_ref;
-	$filter['t.ref']=$search_ref;
+if ($search_ref != '') {
+	$param .= '&search_ref='.$search_ref;
+	$filter['t.ref'] = $search_ref;
 }
-if ($search_type != ''){
-	$param.='&search_type='.$search_type;
-	$filter['ty.label']=$search_type;
+if ($search_type != '') {
+	$param .= '&search_type='.$search_type;
+	$filter['ty.label'] = $search_type;
 }
-if ($search_label != '') 		$param.='&search_label='.$search_label;
+if ($search_label != '') 		$param .= '&search_label='.$search_label;
 // Add $param from extra fields
 foreach ($search_array_options as $key => $val)
 {
-	$crit=$val;
-	$tmpkey=preg_replace('/search_options_/', '', $key);
-	$typ=$extrafields->attributes[$object->table_element]['type'][$tmpkey];
+	$crit = $val;
+	$tmpkey = preg_replace('/search_options_/', '', $key);
+	$typ = $extrafields->attributes[$object->table_element]['type'][$tmpkey];
 	if ($val != '') {
-		$param.='&search_options_'.$tmpkey.'='.urlencode($val);
+		$param .= '&search_options_'.$tmpkey.'='.urlencode($val);
 	}
-	$mode_search=0;
-	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
-	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
-	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+	$mode_search = 0;
+	if (in_array($typ, array('int', 'double', 'real'))) $mode_search = 1; // Search on a numeric
+	if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') $mode_search = 2; // Search on a foreign key int
+	if ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
 	{
 		$filter['ef.'.$tmpkey] = natural_search('ef.'.$tmpkey, $crit, $mode_search);
 	}
 }
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 
 
 $hookmanager->initHooks(array('resourcelist'));
 
-if (empty($sortorder)) $sortorder="ASC";
-if (empty($sortfield)) $sortfield="t.ref";
+if (empty($sortorder)) $sortorder = "ASC";
+if (empty($sortfield)) $sortfield = "t.ref";
 if (empty($arch)) $arch = 0;
 
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$offset = $limit * $page ;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if( ! $user->rights->resource->read) {
+if (!$user->rights->resource->read) {
         accessforbidden();
 }
 $arrayfields = array(
@@ -115,10 +115,10 @@ $arrayfields = array(
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 {
-	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
-		if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
+			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f31e224fdcc..4c8a5f2d8ee 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -27,20 +27,20 @@
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (! defined('NOLOGIN'))         define('NOLOGIN', 1);          // File must be accessed by logon page so without login
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOLOGIN'))         define('NOLOGIN', 1); // File must be accessed by logon page so without login
 //if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 
 
 define('ISLOADEDBYSTEELSHEET', '1');
 
 
-require __DIR__ . '/theme_vars.inc.php';
+require __DIR__.'/theme_vars.inc.php';
 if (defined('THEME_ONLY_CONSTANT')) return;
 
 
@@ -51,7 +51,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
 // and permission, so we can later calculate number of top menu ($nbtopmenuentries) according to user profile.
-if (empty($user->id) && ! empty($_SESSION['dol_login']))
+if (empty($user->id) && !empty($_SESSION['dol_login']))
 {
     $user->fetch('', $_SESSION['dol_login'], '', 1);
     $user->getrights();
@@ -64,147 +64,147 @@ top_httphead('text/css');
 if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
 else header('Cache-Control: no-cache');
 
-if (GETPOST('theme', 'alpha')) $conf->theme=GETPOST('theme', 'alpha');  // If theme was forced on URL
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL
+if (GETPOST('theme', 'alpha')) $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
 
 $langs->load("main", 0, 1);
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
-$path='';    	// This value may be used in future for external module to overwrite theme
-$theme='eldy';	// Value of theme
-if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
+$path = ''; // This value may be used in future for external module to overwrite theme
+$theme = 'eldy'; // Value of theme
+if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES; }
 
 // Define image path files and other constants
-$fontlist='roboto,arial,tahoma,verdana,helvetica';    //$fontlist='helvetica, verdana, arial, sans-serif';
+$fontlist = 'roboto,arial,tahoma,verdana,helvetica'; //$fontlist='helvetica, verdana, arial, sans-serif';
 //$fontlist='"open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;';
-$img_head='';
-$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png', 1);
-$dol_hide_topmenu=$conf->dol_hide_topmenu;
-$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
-$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
-$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
+$img_head = '';
+$img_button = dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png', 1);
+$dol_hide_topmenu = $conf->dol_hide_topmenu;
+$dol_hide_leftmenu = $conf->dol_hide_leftmenu;
+$dol_optimize_smallscreen = $conf->dol_optimize_smallscreen;
+$dol_no_mouse_hover = $conf->dol_no_mouse_hover;
 
 //$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
 //var_dump($user->conf->THEME_ELDY_RGB);
 
-$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:0);
-$borderwidth=1;
+$useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->THEME_ELDY_USEBOLDTITLE : 0);
+$borderwidth = 1;
 
 // Case of option always editable
-if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
-if (! isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1=$colorbackvmenu1;
-if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1=$colorbacktitle1;
-if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=$colorbacklinepairhover;
-if (! isset($conf->global->THEME_ELDY_USE_CHECKED)) $conf->global->THEME_ELDY_USE_CHECKED=$colorbacklinepairchecked;
-if (! isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK=$colorbacklinebreak;
-if (! isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB=$colortexttitlenotab;
-if (! isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK=$colortextlink;
+if (!isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY = $colorbackbody;
+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1;
+if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1;
+if (!isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover;
+if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) $conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked;
+if (!isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak;
+if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab;
+if (!isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
 if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-    $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';     // card
-    $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
-    $conf->global->THEME_ELDY_TEXT='0,0,0';
-    $conf->global->THEME_ELDY_FONT_SIZE1=$fontsize;
-    $conf->global->THEME_ELDY_FONT_SIZE2='0.75em';
+    $conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
+    $conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
+    $conf->global->THEME_ELDY_TEXT = '0,0,0';
+    $conf->global->THEME_ELDY_FONT_SIZE1 = $fontsize;
+    $conf->global->THEME_ELDY_FONT_SIZE2 = '0.75em';
 }
 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
-$colorbackhmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1)   :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorbackvmenu1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1)   :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
-$colortopbordertitle1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPBORDER_TITLE1)?$colortopbordertitle1:$conf->global->THEME_ELDY_TOPBORDER_TITLE1)   :(empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1)?$colortopbordertitle1:$user->conf->THEME_ELDY_TOPBORDER_TITLE1);
-$colorbacktitle1     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1)   ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1)      :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1);
-$colorbacktabcard1   =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1)  :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1);
-$colorbacktabactive  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE);
-$colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1)  ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1);
-$colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2)  ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
-$colorbacklinepair1  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1)    ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1)    :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
-$colorbacklinepair2  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2)    ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2)    :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinebreak  =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEBREAK)    ?$colorbacklinebreak:$conf->global->THEME_ELDY_LINEBREAK)    :(empty($user->conf->THEME_ELDY_LINEBREAK)?$colorbacklinebreak:$user->conf->THEME_ELDY_LINEBREAK);
-$colorbackbody       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY)     ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY)          :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
-$colortexttitlenotab =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$conf->global->THEME_ELDY_TEXTTITLENOTAB)             :(empty($user->conf->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$user->conf->THEME_ELDY_TEXTTITLENOTAB);
-$colortexttitle      =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE)    ?$colortexttitle:$conf->global->THEME_ELDY_TEXTTITLE)             :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE);
-$colortext           =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT)         ?$colortext:$conf->global->THEME_ELDY_TEXT)                  :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT);
-$colortextlink       =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK)     ?$colortextlink:$conf->global->THEME_ELDY_TEXTLINK)              :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK);
-$fontsize            =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1)             :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
-$fontsizesmaller     =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2)   ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2)             :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+$colorbackhmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackvmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $conf->global->THEME_ELDY_VERMENU_BACK1) : (empty($user->conf->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $user->conf->THEME_ELDY_VERMENU_BACK1);
+$colortopbordertitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $conf->global->THEME_ELDY_TOPBORDER_TITLE1) : (empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $user->conf->THEME_ELDY_TOPBORDER_TITLE1);
+$colorbacktitle1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $conf->global->THEME_ELDY_BACKTITLE1) : (empty($user->conf->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $user->conf->THEME_ELDY_BACKTITLE1);
+$colorbacktabcard1   = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $conf->global->THEME_ELDY_BACKTABCARD1) : (empty($user->conf->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $user->conf->THEME_ELDY_BACKTABCARD1);
+$colorbacktabactive  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $conf->global->THEME_ELDY_BACKTABACTIVE) : (empty($user->conf->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $user->conf->THEME_ELDY_BACKTABACTIVE);
+$colorbacklineimpair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $conf->global->THEME_ELDY_LINEIMPAIR1) : (empty($user->conf->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $user->conf->THEME_ELDY_LINEIMPAIR1);
+$colorbacklineimpair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $conf->global->THEME_ELDY_LINEIMPAIR2) : (empty($user->conf->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $user->conf->THEME_ELDY_LINEIMPAIR2);
+$colorbacklinepair1  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $conf->global->THEME_ELDY_LINEPAIR1) : (empty($user->conf->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $user->conf->THEME_ELDY_LINEPAIR1);
+$colorbacklinepair2  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $conf->global->THEME_ELDY_LINEPAIR2) : (empty($user->conf->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $user->conf->THEME_ELDY_LINEPAIR2);
+$colorbacklinebreak  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $conf->global->THEME_ELDY_LINEBREAK) : (empty($user->conf->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $user->conf->THEME_ELDY_LINEBREAK);
+$colorbackbody       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKBODY) ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY);
+$colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB);
+$colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE);
+$colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
+$colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
+$fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
 
 // Hover color
-$colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'e6edf0':$conf->global->THEME_ELDY_USE_HOVER));
-$colorbacklinepairchecked=((! isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255')?'':($conf->global->THEME_ELDY_USE_CHECKED === '1'?'e6edf0':$conf->global->THEME_ELDY_USE_CHECKED));
-if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
+$colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_HOVER));
+$colorbacklinepairchecked = ((!isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_CHECKED));
+if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
 {
-    $colorbacklinepairhover=((! isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0')?'':($user->conf->THEME_ELDY_USE_HOVER === '1'?'e6edf0':$user->conf->THEME_ELDY_USE_HOVER));
-    $colorbacklinepairchecked=((! isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0')?'':($user->conf->THEME_ELDY_USE_CHECKED === '1'?'e6edf0':$user->conf->THEME_ELDY_USE_CHECKED));
+    $colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_HOVER));
+    $colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_CHECKED));
 }
 
 
 // Set text color to black or white
-$colorbackhmenu1=join(',', colorStringToArray($colorbackhmenu1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',', $colorbackhmenu1);
-$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) $colortextbackhmenu='FFFFFF';
-else $colortextbackhmenu='000000';
+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbackhmenu1);
+$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+if ($tmpval <= 460) $colortextbackhmenu = 'FFFFFF';
+else $colortextbackhmenu = '000000';
 
-$colorbackvmenu1=join(',', colorStringToArray($colorbackvmenu1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',', $colorbackvmenu1);
-$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbackvmenu='FFFFFF'; }
-else { $colortextbackvmenu='000000'; }
+$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbackvmenu1);
+$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; }
+else { $colortextbackvmenu = '000000'; }
 
-$colorbacktitle1=join(',', colorStringToArray($colorbacktitle1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',', $colorbacktitle1);
+$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbacktitle1);
 if ($colortexttitle == '')
 {
-    $tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-    if ($tmpval <= 460) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
-    else { $colortexttitle='000000'; $colorshadowtitle='FFFFFF'; }
+    $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+    if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; }
+    else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; }
 }
-else $colorshadowtitle='888888';
+else $colorshadowtitle = '888888';
 
-$colorbacktabcard1=join(',', colorStringToArray($colorbacktabcard1));    // Normalize value to 'x,y,z'
-$tmppart=explode(',', $colorbacktabcard1);
-$tmpval=(! empty($tmppart[0]) ? $tmppart[0] : 0)+(! empty($tmppart[1]) ? $tmppart[1] : 0)+(! empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbacktab='FFFFFF'; }
-else { $colortextbacktab='000000'; }
+$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
+$tmppart = explode(',', $colorbacktabcard1);
+$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
+if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; }
+else { $colortextbacktab = '000000'; }
 
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
-$colorbackhmenu1=join(',', colorStringToArray($colorbackhmenu1));
-$colorbackvmenu1=join(',', colorStringToArray($colorbackvmenu1));
-$colorbacktitle1=join(',', colorStringToArray($colorbacktitle1));
-$colorbacktabcard1=join(',', colorStringToArray($colorbacktabcard1));
-$colorbacktabactive=join(',', colorStringToArray($colorbacktabactive));
-$colorbacklineimpair1=join(',', colorStringToArray($colorbacklineimpair1));
-$colorbacklineimpair2=join(',', colorStringToArray($colorbacklineimpair2));
-$colorbacklinepair1=join(',', colorStringToArray($colorbacklinepair1));
-$colorbacklinepair2=join(',', colorStringToArray($colorbacklinepair2));
-if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',', colorStringToArray($colorbacklinepairhover));
-if ($colorbacklinepairchecked != '') $colorbacklinepairchecked=join(',', colorStringToArray($colorbacklinepairchecked));
-$colorbackbody=join(',', colorStringToArray($colorbackbody));
-$colortexttitlenotab=join(',', colorStringToArray($colortexttitlenotab));
-$colortexttitle=join(',', colorStringToArray($colortexttitle));
-$colortext=join(',', colorStringToArray($colortext));
-$colortextlink=join(',', colorStringToArray($colortextlink));
+$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1));
+$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1));
+$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1));
+$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1));
+$colorbacktabactive = join(',', colorStringToArray($colorbacktabactive));
+$colorbacklineimpair1 = join(',', colorStringToArray($colorbacklineimpair1));
+$colorbacklineimpair2 = join(',', colorStringToArray($colorbacklineimpair2));
+$colorbacklinepair1 = join(',', colorStringToArray($colorbacklinepair1));
+$colorbacklinepair2 = join(',', colorStringToArray($colorbacklinepair2));
+if ($colorbacklinepairhover != '') $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover));
+if ($colorbacklinepairchecked != '') $colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked));
+$colorbackbody = join(',', colorStringToArray($colorbackbody));
+$colortexttitlenotab = join(',', colorStringToArray($colortexttitlenotab));
+$colortexttitle = join(',', colorStringToArray($colortexttitle));
+$colortext = join(',', colorStringToArray($colortext));
+$colortextlink = join(',', colorStringToArray($colortextlink));
 
-$nbtopmenuentries=$menumanager->showmenu('topnb');
+$nbtopmenuentries = $menumanager->showmenu('topnb');
 if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10);
 
 
-$minwidthtmenu=66;		/* minimum width for one top menu entry */
-$heightmenu=48;			/* height of top menu, part with image */
-$heightmenu2=49;        /* height of top menu, part with login  */
+$minwidthtmenu = 66; /* minimum width for one top menu entry */
+$heightmenu = 48; /* height of top menu, part with image */
+$heightmenu2 = 49; /* height of top menu, part with login  */
 $disableimages = 0;
 $maxwidthloginblock = 180;
-if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = $maxwidthloginblock + 50; $minwidthtmenu=0; }
+if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = $maxwidthloginblock + 50; $minwidthtmenu = 0; }
 
 
-if(!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)){ $maxwidthloginblock = $maxwidthloginblock + 55; }
-if(! empty($conf->bookmark->enabled) && !empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
+if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
+if (!empty($conf->bookmark->enabled) && !empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
 
 
 print '/*'."\n";
@@ -241,7 +241,7 @@ print '*/'."\n";
 
 
 // Include the global.inc.php that include the badges, btn, info-box, dropdown, progress...
-require __DIR__ . '/global.inc.php';
+require __DIR__.'/global.inc.php';
 
 
 if (is_object($db)) $db->close();
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 720879eadec..c67a4ad9d50 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -27,77 +27,77 @@
  */
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
-$theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 166, 90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
-if (! defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
+$theme_bordercolor = array(235, 235, 224);
+$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
+if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
 {
 	if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
 	{
 		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
 		{
-			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250,190,30), array(221, 75, 57), array(0, 166, 90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
 		else
 		{
 			// for now we use the same configuration for all types of color blind
-			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85,135,150), array(150,135,80), array(150,80,150));
+			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
 	}
 }
-$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
-$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
+$theme_bgcolor = array(hexdec('F4'), hexdec('F4'), hexdec('F4'));
+$theme_bgcoloronglet = array(hexdec('DE'), hexdec('E7'), hexdec('EC'));
 
 
 // Colors
-$colorbackhmenu1='90,50,120';      // topmenu
-$colorbackvmenu1='255,255,255';      // vmenu
-$colortopbordertitle1='';           // top border of tables-lists title. not defined = default to colorbackhmenu1
-$colorbacktitle1='240,240,240';      // title of tables-lists
-$colorbacktabcard1='255,255,255';  // card
-$colorbacktabactive='234,234,234';
-$colorbacklineimpair1='255,255,255';    // line impair
-$colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='248,248,248';    // line pair
-$colorbacklinepair2='246,246,246';    // line pair
-$colorbacklinepairhover='230,237,244';    // line hover
-$colorbacklinepairchecked='230,237,244';	// line checked
-$colorbacklinebreak='214,218,220';
-$colorbackbody='248,248,248';
-$colortexttitlenotab='90,90,90';
-$colortexttitle='20,20,20';
-$colortext='0,0,0';
-$colortextlink='0,0,120';
+$colorbackhmenu1 = '90,50,120'; // topmenu
+$colorbackvmenu1 = '255,255,255'; // vmenu
+$colortopbordertitle1 = ''; // top border of tables-lists title. not defined = default to colorbackhmenu1
+$colorbacktitle1 = '240,240,240'; // title of tables-lists
+$colorbacktabcard1 = '255,255,255'; // card
+$colorbacktabactive = '234,234,234';
+$colorbacklineimpair1 = '255,255,255'; // line impair
+$colorbacklineimpair2 = '255,255,255'; // line impair
+$colorbacklinepair1 = '248,248,248'; // line pair
+$colorbacklinepair2 = '246,246,246'; // line pair
+$colorbacklinepairhover = '230,237,244'; // line hover
+$colorbacklinepairchecked = '230,237,244'; // line checked
+$colorbacklinebreak = '214,218,220';
+$colorbackbody = '248,248,248';
+$colortexttitlenotab = '90,90,90';
+$colortexttitle = '20,20,20';
+$colortext = '0,0,0';
+$colortextlink = '0,0,120';
 $fontsize = '14';
-$fontsizesmaller='11';
+$fontsizesmaller = '11';
 
 // text color
-$textSuccess   ='#28a745';
-$colorblind_deuteranopes_textSuccess   ='#37de5d';
-$textDanger    ='#dc3545';
-$textWarning   ='#f39c12';
+$textSuccess   = '#28a745';
+$colorblind_deuteranopes_textSuccess = '#37de5d';
+$textDanger    = '#dc3545';
+$textWarning   = '#f39c12';
 $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color
 
 // Badges colors
-$badgePrimary   ='#007bff';
-$badgeSecondary ='#999999';
-$badgeSuccess   ='#28a745';
-$badgeDanger    ='#8c4446';
-$badgeWarning   ='#ffc107';
-$badgeInfo      ='#17a2b8';
-$badgeDark      ='#343a40';
-$badgeLight     ='#f8f9fa';
+$badgePrimary   = '#007bff';
+$badgeSecondary = '#999999';
+$badgeSuccess   = '#28a745';
+$badgeDanger    = '#8c4446';
+$badgeWarning   = '#ffc107';
+$badgeInfo      = '#17a2b8';
+$badgeDark      = '#343a40';
+$badgeLight     = '#f8f9fa';
 
 /* default color for status : After a quick check, somme status can have oposite function according to objects
 *  So this badges status uses default value according to theme eldy status img
 *  TODO: use color definition vars above for define badges color status X -> expemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
 */
-$badgeStatus0='#cbd3d3';
-$badgeStatus1='#bc9526';
-$badgeStatus2='#e6f0f0';
-$badgeStatus3='#bca52b';
-$badgeStatus4='#277d1e';
-$badgeStatus5='#cad2d2';
-$badgeStatus6='#cad2d2';
-$badgeStatus7='#baa32b';
-$badgeStatus8='#be3013';
-$badgeStatus9='#e7f0f0';
+$badgeStatus0 = '#cbd3d3';
+$badgeStatus1 = '#bc9526';
+$badgeStatus2 = '#e6f0f0';
+$badgeStatus3 = '#bca52b';
+$badgeStatus4 = '#277d1e';
+$badgeStatus5 = '#cad2d2';
+$badgeStatus6 = '#cad2d2';
+$badgeStatus7 = '#baa32b';
+$badgeStatus8 = '#be3013';
+$badgeStatus9 = '#e7f0f0';
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index 289d92e74fa..80aff24b9ba 100644
--- a/htdocs/ticket/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
@@ -16,7 +16,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -36,18 +36,18 @@ $langs->load('ticket');
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'datec', 'desc', 0, 0, 1);
 
-$total=0;
-$ilink=0;
-foreach($linkedObjectBlock as $key => $objectlink)
+$total = 0;
+$ilink = 0;
+foreach ($linkedObjectBlock as $key => $objectlink)
 {
 	$ilink++;
 
-	$trclass='oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
 	?>
     <tr class="<?php echo $trclass; ?>" >
         <td class="linkedcol-element" ><?php echo $langs->trans("Ticket"); ?>
-        <?php if(!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';  ?>
+        <?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a'; ?>
         </td>
         <td class="linkedcol-name nowraponall" ><?php echo $objectlink->getNomUrl(1); ?></td>
     	<td class="linkedcol-ref" align="center"><?php echo $objectlink->ref_client; ?></td>
@@ -61,7 +61,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
     	<td class="linkedcol-action right">
     		<?php
     		// For now, shipments must stay linked to order, so link is not deletable
-    		if($object->element != 'shipping') {
+    		if ($object->element != 'shipping') {
     			?>
     			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
     			<?php
@@ -74,7 +74,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 if (count($linkedObjectBlock) > 1)
 {
 	?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter)?'liste_sub_total':''); ?>">
+    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
         <td><?php echo $langs->trans("Total"); ?></td>
         <td></td>
     	<td align="center"></td>
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index ae9d3ebf066..7446b781c45 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -34,42 +34,42 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 // Load translation files required by page
 $langs->loadLangs(array('users', 'other'));
 
-$action=GETPOST('action', 'aZ09');
-$confirm=GETPOST('confirm');
-$id=(GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('id', 'int'));
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('id', 'int'));
 $ref = GETPOST('ref', 'alpha');
-$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'userdoc';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'userdoc'; // To manage different context of search
 
 // Define value to know what current user can do on users
-$canadduser=(! empty($user->admin) || $user->rights->user->user->creer);
-$canreaduser=(! empty($user->admin) || $user->rights->user->user->lire);
-$canedituser=(! empty($user->admin) || $user->rights->user->user->creer);
-$candisableuser=(! empty($user->admin) || $user->rights->user->user->supprimer);
-$canreadgroup=$canreaduser;
-$caneditgroup=$canedituser;
-if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS))
+$canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
+$canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
+$canedituser = (!empty($user->admin) || $user->rights->user->user->creer);
+$candisableuser = (!empty($user->admin) || $user->rights->user->user->supprimer);
+$canreadgroup = $canreaduser;
+$caneditgroup = $canedituser;
+if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
-    $canreadgroup=(! empty($user->admin) || $user->rights->user->group_advance->read);
-    $caneditgroup=(! empty($user->admin) || $user->rights->user->group_advance->write);
+    $canreadgroup = (!empty($user->admin) || $user->rights->user->group_advance->read);
+    $caneditgroup = (!empty($user->admin) || $user->rights->user->group_advance->write);
 }
 // Define value to know what current user can do on properties of edited user
 if ($id)
 {
     // $user est le user qui edite, $id est l'id de l'utilisateur edite
-    $caneditfield=((($user->id == $id) && $user->rights->user->self->creer)
+    $caneditfield = ((($user->id == $id) && $user->rights->user->self->creer)
     || (($user->id != $id) && $user->rights->user->user->creer));
-    $caneditpassword=((($user->id == $id) && $user->rights->user->self->password)
+    $caneditpassword = ((($user->id == $id) && $user->rights->user->self->password)
     || (($user->id != $id) && $user->rights->user->user->password));
 }
 
 // Security check
-$socid=0;
+$socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
-$feature2='user';
+$feature2 = 'user';
 
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
-if ($user->id <> $id && ! $canreaduser) accessforbidden();
+if ($user->id <> $id && !$canreaduser) accessforbidden();
 
 // Get parameters
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -79,29 +79,29 @@ if (empty($page) || $page == -1) { $page = 0; }
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="position_name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "position_name";
 
 $object = new User($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$result = $object->fetch($id, $ref, '', 1);
 	$object->getrights();
 	//$upload_dir = $conf->user->multidir_output[$object->entity] . "/" . $object->id ;
 	// For users, the upload_dir is always $conf->user->entity for the moment
-	$upload_dir = $conf->user->dir_output. "/" . $object->id ;
+	$upload_dir = $conf->user->dir_output."/".$object->id;
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('usercard','userdoc','globalcard'));
+$hookmanager->initHooks(array('usercard', 'userdoc', 'globalcard'));
 
 
 /*
  * Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
@@ -122,10 +122,10 @@ if ($object->id)
 	/*
 	 * Affichage onglets
 	 */
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = user_prepare_head($object);
 
-	$form=new Form($db);
+	$form = new Form($db);
 
 	dol_fiche_head($head, 'document', $langs->trans("User"), -1, 'user');
 
@@ -140,11 +140,11 @@ if ($object->id)
     print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
-	$filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
 	{
-		$totalsize+=$file['size'];
+		$totalsize += $file['size'];
 	}
 
 
@@ -168,8 +168,8 @@ if ($object->id)
 	$modulepart = 'user';
 	$permission = $user->rights->user->user->creer;
 	$permtoedit = $user->rights->user->user->creer;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 4dfd40a8f53..1c09aae62df 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -495,6 +495,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 	 * [...]
 	 * )
 	 *
+	 * @param User $user Object user
 	 * @param Product $product Parent product
 	 * @param array $combinations Attribute and value combinations.
 	 * @param array $variations Price and weight variations
@@ -503,9 +504,9 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 	 * @param bool|float $forced_weightvar If the weight variation is forced
 	 * @return int <0 KO, >0 OK
 	 */
-	public function createProductCombination(Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false)
+	public function createProductCombination(User $user, Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false)
 	{
-		global $db, $user, $conf;
+		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
@@ -660,11 +661,12 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
     /**
      * Copies all product combinations from the origin product to the destination product
      *
+	 * @param 	User 	$user	Object user
      * @param   int     $origProductId  Origin product id
      * @param   Product $destProduct    Destination product
      * @return  int                     >0 OK <0 KO
      */
-	public function copyAll($origProductId, Product $destProduct)
+	public function copyAll(User $user, $origProductId, Product $destProduct)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
 
@@ -686,6 +688,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 			}
 
             if ($this->createProductCombination(
+				$user,
 				$destProduct,
 				$variations,
 				array(),
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 714ee07ed3f..f8a8b9cc9e5 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -141,7 +141,7 @@ if ($_POST) {
 
 			if (!$prodcomb->fetchByProductCombination2ValuePairs($id, $sanit_features))
 			{
-				$result = $prodcomb->createProductCombination($object, $sanit_features, array(), $price_impact_percent, $price_impact, $weight_impact);
+				$result = $prodcomb->createProductCombination($user, $object, $sanit_features, array(), $price_impact_percent, $price_impact, $weight_impact);
 				if ($result > 0)
 				{
 					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
@@ -268,7 +268,7 @@ if ($action === 'confirm_deletecombination') {
 	if ($prodstatic->fetch('', $dest_product) > 0) {
 		//To prevent from copying to the same product
 		if ($prodstatic->ref != $object->ref) {
-			if ($prodcomb->copyAll($object->id, $prodstatic) > 0) {
+			if ($prodcomb->copyAll($user, $object->id, $prodstatic) > 0) {
 				header('Location: '.dol_buildpath('/variants/combinations.php?id='.$prodstatic->id, 2));
 				exit();
 			} else {
diff --git a/htdocs/variants/generator.php b/htdocs/variants/generator.php
index 27f811fdafe..137186bd5b8 100644
--- a/htdocs/variants/generator.php
+++ b/htdocs/variants/generator.php
@@ -110,7 +110,7 @@ if ($_POST)
 			$cartesianarray = cartesianArray($adapted_values);
 			foreach ($cartesianarray as $currcomb)
 			{
-				$res = $combination->createProductCombination($product, $currcomb, $sanitized_values, $price_var_percent);
+				$res = $combination->createProductCombination($user, $product, $currcomb, $sanitized_values, $price_var_percent);
 				if ($res < 0) {
 				    $error++;
 				    setEventMessages($combination->error, $combination->errors, 'errors');