diff --git a/ChangeLog b/ChangeLog
index 1ce34b5e87a..6fdbcfcd899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@ Following changes may create regressions for some external modules, but were nec
 * All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'. 
 * All properties 'type_libelle' were renamed into 'type_label'.
 * Renamed property of thirdparty "statut_commercial" into "status_prospect_label"
+* The jquery plugin/dependency multiselect has been removed. It was not used by Dolibarr core.
 
 ***** ChangeLog for 10.0.3 compared to 10.0.2 *****
 IMPORTANT : This version fixes a serious bug in saving the units of weight, size, surface and volume on product card.
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 02174ea2524..86ec1162832 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("accountancy"));
 
-$page = GETPOST("page");
+$page = GETPOST("page", 'int');
 $sortorder = GETPOST("sortorder", 'alpha');
 $sortfield = GETPOST("sortfield", 'alpha');
 $action = GETPOST('action', 'aZ09');
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index d898be2b208..0db4c7b6c24 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -575,8 +575,8 @@ if ($action == 'delmouv') {
 }
 if ($action == 'delbookkeepingyear') {
 	$form_question = array();
-	$delyear = GETPOST('delyear');
-	$deljournal = GETPOST('deljournal');
+	$delyear = GETPOST('delyear', 'int');
+	$deljournal = GETPOST('deljournal', 'alpha');
 
 	if (empty($delyear)) {
 		$delyear = dol_print_date(dol_now(), '%Y');
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index 4f93aa18875..c59e87dfd93 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -36,7 +36,7 @@ class AccountancySystem
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var int ID
@@ -48,7 +48,14 @@ class AccountancySystem
      */
 	public $fk_pcg_version;
 
+    /**
+     * @var string pcg type
+     */
 	public $pcg_type;
+
+    /**
+     * @var string pcg subtype
+     */
 	public $pcg_subtype;
 
 	/**
@@ -61,7 +68,14 @@ class AccountancySystem
      */
     public $label;
 
+    /**
+     * @var string account number
+     */
 	public $account_number;
+
+    /**
+     * @var string account parent
+     */
 	public $account_parent;
 
 	/**
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 886b2ade2d4..1191187a139 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -42,8 +42,7 @@ class AccountingJournal extends CommonObject
 	public $fk_element = '';
 
 	/**
-	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 * @var int
+	 * @var int 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 */
 	public $ismultientitymanaged = 0;
 
@@ -57,6 +56,9 @@ class AccountingJournal extends CommonObject
 	 */
 	public $rowid;
 
+    /**
+     * @var string Accounting journal code
+     */
 	public $code;
 
 	/**
@@ -64,9 +66,19 @@ class AccountingJournal extends CommonObject
      */
     public $label;
 
-	public $nature; // 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new
+    /**
+     * @var int 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new
+     */
+    public $nature;
+
+    /**
+     * @var int is active or not
+     */
 	public $active;
 
+    /**
+     * @var array array of lines
+     */
 	public $lines;
 
 	/**
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 69c17f3484e..a1116ecd6a2 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2014-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2017  Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,16 +32,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class BookKeeping extends CommonObject
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error;
-
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
-
 	/**
 	 * @var string Id to identify managed objects
 	 */
@@ -67,7 +57,14 @@ class BookKeeping extends CommonObject
 	 */
 	public $id;
 
+    /**
+     * @var string Date of source document, in db date NOT NULL
+     */
 	public $doc_date;
+
+    /**
+     * @var int Deadline for payment
+     */
 	public $date_lim_reglement;
 
     /**
@@ -119,9 +116,25 @@ class BookKeeping extends CommonObject
      * @var string label operation
      */
     public $label_operation;
+
+    /**
+     * @var float FEC:Debit
+     */
 	public $debit;
+
+    /**
+     * @var float FEC:Credit
+     */
 	public $credit;
+
+    /**
+     * @var float FEC:Amount (Not necessary)
+     */
 	public $montant;
+
+    /**
+     * @var string FEC:Sens (Not necessary)
+     */
 	public $sens;
 
 	/**
@@ -129,9 +142,24 @@ class BookKeeping extends CommonObject
      */
 	public $fk_user_author;
 
+    /**
+     * @var string key for import
+     */
 	public $import_key;
+
+    /**
+     * @var string code journal
+     */
 	public $code_journal;
+
+    /**
+     * @var string label journal
+     */
 	public $journal_label;
+
+    /**
+     * @var int accounting transaction id
+     */
 	public $piece_num;
 
 	/**
@@ -140,7 +168,6 @@ class BookKeeping extends CommonObject
 	public $picto = 'generic';
 
 
-
 	/**
 	 * Constructor
 	 *
@@ -198,13 +225,13 @@ class BookKeeping extends CommonObject
 			$this->label_operation = trim($this->label_operation);
 		}
 		if (isset($this->debit)) {
-			$this->debit = trim($this->debit);
+			$this->debit = (float) $this->debit;
 		}
 		if (isset($this->credit)) {
-			$this->credit = trim($this->credit);
+			$this->credit = (float) $this->credit;
 		}
 		if (isset($this->montant)) {
-			$this->montant = trim($this->montant);
+			$this->montant = (float) $this->montant;
 		}
 		if (isset($this->sens)) {
 			$this->sens = trim($this->sens);
@@ -221,8 +248,8 @@ class BookKeeping extends CommonObject
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
-		if (empty($this->debit)) $this->debit = 0;
-		if (empty($this->credit)) $this->credit = 0;
+		if (empty($this->debit)) $this->debit = 0.0;
+		if (empty($this->credit)) $this->credit = 0.0;
 
 		// Check parameters
 		if (($this->numero_compte == "") || $this->numero_compte == '-1' || $this->numero_compte == 'NotDefined')
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index e8e1da09dd0..836dedc0dc2 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -629,7 +629,9 @@ if (! $error && $action == 'writebookkeeping') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
 							$bookkeeping->numero_compte = $k;
-							$bookkeeping->label_compte = $objmid->labelc;
+
+							$accountingaccount->fetch(null, $k, true);
+							$bookkeeping->label_compte = $accountingaccount->label;
 						} elseif ($tabtype[$key] == 'payment_vat') {
 							$bookkeeping->subledger_account = '';
 							$bookkeeping->subledger_label = '';
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 2a8177df6f2..e19afe70e13 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1077,7 +1077,7 @@ else
 		print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
-      	    print $object->showOptionals($extrafields, 'edit');
+      	    print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
 		print '<tbody>';
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 5006becb053..442d8cf091f 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -99,9 +99,9 @@ class AdherentType extends CommonObject
 	public $mail_valid;
 
 	/** @var array Array of members */
-	public $members=array();
+	public $members = array();
 
-    public $multilangs=array();
+    public $multilangs = array();
 
 
 	/**
@@ -127,8 +127,8 @@ class AdherentType extends CommonObject
         $current_lang = $langs->getDefaultLang();
 
         $sql = "SELECT lang, label, description, email";
-        $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-        $sql.= " WHERE fk_type=".$this->id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
+        $sql .= " WHERE fk_type=".$this->id;
 
         $result = $this->db->query($sql);
         if ($result) {
@@ -138,7 +138,7 @@ class AdherentType extends CommonObject
                 if ($obj->lang == $current_lang)  // si on a les traduct. dans la langue courante on les charge en infos principales.
                 {
                     $this->label        = $obj->label;
-                    $this->description    = $obj->description;
+                    $this->description = $obj->description;
                     $this->email        = $obj->email;
                 }
                 $this->multilangs["$obj->lang"]["label"] = $obj->label;
@@ -149,7 +149,7 @@ class AdherentType extends CommonObject
         }
         else
         {
-            $this->error="Error: ".$this->db->lasterror()." - ".$sql;
+            $this->error = "Error: ".$this->db->lasterror()." - ".$sql;
             return -1;
         }
     }
@@ -171,75 +171,75 @@ class AdherentType extends CommonObject
         {
             if ($key == $current_lang) {
                 $sql = "SELECT rowid";
-                $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-                $sql.= " WHERE fk_type=".$this->id;
-                $sql.= " AND lang='".$key."'";
+                $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
+                $sql .= " WHERE fk_type=".$this->id;
+                $sql .= " AND lang='".$key."'";
 
                 $result = $this->db->query($sql);
 
                 if ($this->db->num_rows($result)) // if there is already a description line for this language
                 {
                     $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
-                    $sql2.= " SET ";
-                    $sql2.= " label='".$this->db->escape($this->label)."',";
-                    $sql2.= " description='".$this->db->escape($this->description)."'";
-                    if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2.= ", email='".$this->db->escape($this->other)."'";
+                    $sql2 .= " SET ";
+                    $sql2 .= " label='".$this->db->escape($this->label)."',";
+                    $sql2 .= " description='".$this->db->escape($this->description)."'";
+                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", email='".$this->db->escape($this->other)."'";
                     }
-                    $sql2.= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
+                    $sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
                 }
                 else
                 {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
-                    if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2.=", email";
+                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", email";
                     }
-                    $sql2.= ")";
-                    $sql2.= " VALUES(".$this->id.",'".$this->db->escape($key)."','". $this->db->escape($this->label)."',";
-                    $sql2.= " '".$this->db->escape($this->description)."'";
-                    if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2.= ", '".$this->db->escape($this->other)."'";
+                    $sql2 .= ")";
+                    $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
+                    $sql2 .= " '".$this->db->escape($this->description)."'";
+                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", '".$this->db->escape($this->other)."'";
                     }
-                    $sql2.= ")";
+                    $sql2 .= ")";
                 }
                 dol_syslog(get_class($this).'::setMultiLangs key = current_lang = '.$key);
-                if (! $this->db->query($sql2)) {
-                    $this->error=$this->db->lasterror();
+                if (!$this->db->query($sql2)) {
+                    $this->error = $this->db->lasterror();
                     return -1;
                 }
             }
             elseif (isset($this->multilangs[$key])) {
                 $sql = "SELECT rowid";
-                $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-                $sql.= " WHERE fk_type=".$this->id;
-                $sql.= " AND lang='".$key."'";
+                $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
+                $sql .= " WHERE fk_type=".$this->id;
+                $sql .= " AND lang='".$key."'";
 
                 $result = $this->db->query($sql);
 
                 if ($this->db->num_rows($result)) // if there is already a description line for this language
                 {
                     $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
-                    $sql2.= " SET ";
-                    $sql2.= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
-                    $sql2.= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
-                    if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2.= ", email='".$this->db->escape($this->multilangs["$key"]["other"])."'";
+                    $sql2 .= " SET ";
+                    $sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
+                    $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
+                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", email='".$this->db->escape($this->multilangs["$key"]["other"])."'";
                     }
-                    $sql2.= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
+                    $sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
                 }
                 else
                 {
                     $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
-                    if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2.=", email";
+                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", email";
                     }
-                    $sql2.= ")";
-                    $sql2.= " VALUES(".$this->id.",'".$this->db->escape($key)."','". $this->db->escape($this->multilangs["$key"]["label"])."',";
-                    $sql2.= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
-                    if (! empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2.= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";
+                    $sql2 .= ")";
+                    $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
+                    $sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
+                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";
                     }
-                    $sql2.= ")";
+                    $sql2 .= ")";
                 }
 
                 // We do not save if main fields are empty
                 if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"]) {
-                    if (! $this->db->query($sql2)) {
-                        $this->error=$this->db->lasterror();
+                    if (!$this->db->query($sql2)) {
+                        $this->error = $this->db->lasterror();
                         return -1;
                     }
                 }
@@ -272,7 +272,7 @@ class AdherentType extends CommonObject
     public function delMultiLangs($langtodelete, $user)
     {
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-        $sql.= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
+        $sql .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
 
         dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);
         $result = $this->db->query($sql);
@@ -289,7 +289,7 @@ class AdherentType extends CommonObject
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
             return -1;
         }
@@ -306,22 +306,22 @@ class AdherentType extends CommonObject
 	{
 		global $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
-		$this->statut=(int) $this->statut;
-		$this->label=trim($this->label);
+		$this->statut = (int) $this->statut;
+		$this->label = trim($this->label);
 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type (";
-		$sql.= " morphy";
-		$sql.= ", libelle";
-		$sql.= ", entity";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->morphy)."'";
-		$sql.= ", '".$this->db->escape($this->label)."'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ")";
+		$sql .= " morphy";
+		$sql .= ", libelle";
+		$sql .= ", entity";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->escape($this->morphy)."'";
+		$sql .= ", '".$this->db->escape($this->label)."'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ")";
 
 		dol_syslog("Adherent_type::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -336,15 +336,15 @@ class AdherentType extends CommonObject
 				return -3;
 			}
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('MEMBER_TYPE_CREATE', $user);
+				$result = $this->call_trigger('MEMBER_TYPE_CREATE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return $this->id;
@@ -358,7 +358,7 @@ class AdherentType extends CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -375,23 +375,23 @@ class AdherentType extends CommonObject
 	{
         global $langs, $conf, $hookmanager;
 
-		$error=0;
+		$error = 0;
 
-		$this->label=trim($this->label);
+		$this->label = trim($this->label);
 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
-		$sql.= "SET ";
-		$sql.= "statut = ".$this->statut.",";
-		$sql.= "libelle = '".$this->db->escape($this->label) ."',";
-		$sql.= "morphy = '".$this->db->escape($this->morphy) ."',";
-		$sql.= "subscription = '".$this->db->escape($this->subscription)."',";
-		$sql.= "duration = '" . $this->db->escape($this->duration_value . $this->duration_unit) ."',";
-		$sql.= "note = '".$this->db->escape($this->note)."',";
-		$sql.= "vote = ".(integer) $this->db->escape($this->vote).",";
-		$sql.= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
-		$sql.= " WHERE rowid =".$this->id;
+		$sql .= "SET ";
+		$sql .= "statut = ".$this->statut.",";
+		$sql .= "libelle = '".$this->db->escape($this->label)."',";
+		$sql .= "morphy = '".$this->db->escape($this->morphy)."',";
+		$sql .= "subscription = '".$this->db->escape($this->subscription)."',";
+		$sql .= "duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."',";
+		$sql .= "note = '".$this->db->escape($this->note)."',";
+		$sql .= "vote = ".(integer) $this->db->escape($this->vote).",";
+		$sql .= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
+		$sql .= " WHERE rowid =".$this->id;
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -399,34 +399,34 @@ class AdherentType extends CommonObject
             $this->description = $this->db->escape($this->note);
 
             // Multilangs
-            if (! empty($conf->global->MAIN_MULTILANGS)) {
+            if (!empty($conf->global->MAIN_MULTILANGS)) {
                 if ($this->setMultiLangs($user) < 0) {
-                    $this->error=$langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+                    $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
                     return -2;
                 }
             }
 
-			$action='update';
+			$action = 'update';
 
 			// Actions on extra fields
-			if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				$result=$this->insertExtraFields();
+				$result = $this->insertExtraFields();
 				if ($result < 0)
 				{
 					$error++;
 				}
 			}
 
-			if (! $error && ! $notrigger)
+			if (!$error && !$notrigger)
 			{
 				// Call trigger
-				$result=$this->call_trigger('MEMBER_TYPE_MODIFY', $user);
+				$result = $this->call_trigger('MEMBER_TYPE_MODIFY', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return 1;
@@ -440,7 +440,7 @@ class AdherentType extends CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -458,13 +458,13 @@ class AdherentType extends CommonObject
 		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type";
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			// Call trigger
-			$result=$this->call_trigger('MEMBER_TYPE_DELETE', $user);
+			$result = $this->call_trigger('MEMBER_TYPE_DELETE', $user);
 			if ($result < 0) { $error++; $this->db->rollback(); return -2; }
 			// End call triggers
 
@@ -474,7 +474,7 @@ class AdherentType extends CommonObject
 		else
 		{
 			$this->db->rollback();
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -495,7 +495,7 @@ class AdherentType extends CommonObject
 
 		dol_syslog("Adherent_type::fetch", LOG_DEBUG);
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -506,10 +506,10 @@ class AdherentType extends CommonObject
 				$this->ref            = $obj->rowid;
 				$this->label          = $obj->label;
 				$this->morphy         = $obj->morphy;
-				$this->statut         = $obj->status;	// deprecated
+				$this->statut         = $obj->status; // deprecated
 				$this->status         = $obj->status;
 				$this->duration       = $obj->duration;
-				$this->duration_value = substr($obj->duration, 0, dol_strlen($obj->duration)-1);
+				$this->duration_value = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
 				$this->duration_unit  = substr($obj->duration, -1);
 				$this->subscription   = $obj->subscription;
 				$this->mail_valid     = $obj->mail_valid;
@@ -517,7 +517,7 @@ class AdherentType extends CommonObject
 				$this->vote           = $obj->vote;
 
                 // multilangs
-                if (! empty($conf->global->MAIN_MULTILANGS)) {
+                if (!empty($conf->global->MAIN_MULTILANGS)) {
                     $this->getMultiLangs();
                 }
 			}
@@ -526,7 +526,7 @@ class AdherentType extends CommonObject
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -540,15 +540,15 @@ class AdherentType extends CommonObject
 	public function liste_array()
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$adherenttypes = array();
 
 		$sql = "SELECT rowid, libelle as label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."adherent_type";
-		$sql.= " WHERE entity IN (".getEntity('member_type').")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
+		$sql .= " WHERE entity IN (".getEntity('member_type').")";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$nump = $this->db->num_rows($resql);
@@ -585,13 +585,13 @@ class AdherentType extends CommonObject
 	{
 		global $conf, $user;
 
-		$ret=array();
+		$ret = array();
 
 		$sql = "SELECT a.rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
-		$sql.= " WHERE a.entity IN (".getEntity('member').")";
-		$sql.= " AND a.fk_adherent_type = ".$this->id;
-		if (! empty($excludefilter)) $sql.=' AND ('.$excludefilter.')';
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
+		$sql .= " WHERE a.entity IN (".getEntity('member').")";
+		$sql .= " AND a.fk_adherent_type = ".$this->id;
+		if (!empty($excludefilter)) $sql .= ' AND ('.$excludefilter.')';
 
 		dol_syslog(get_class($this)."::listUsersForGroup", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -599,31 +599,31 @@ class AdherentType extends CommonObject
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				if (! array_key_exists($obj->rowid, $ret))
+				if (!array_key_exists($obj->rowid, $ret))
 				{
 					if ($mode < 2)
 					{
-						$memberstatic=new Adherent($this->db);
+						$memberstatic = new Adherent($this->db);
 						if ($mode == 1) {
 							$memberstatic->fetch($obj->rowid, '', '', '', false, false);
 						} else {
 							$memberstatic->fetch($obj->rowid);
 						}
-						$ret[$obj->rowid]=$memberstatic;
+						$ret[$obj->rowid] = $memberstatic;
 					}
-					else $ret[$obj->rowid]=$obj->rowid;
+					else $ret[$obj->rowid] = $obj->rowid;
 				}
 			}
 
 			$this->db->free($resql);
 
-			$this->members=$ret;
+			$this->members = $ret;
 
 			return $ret;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -655,15 +655,15 @@ class AdherentType extends CommonObject
     {
         global $langs;
 
-        $result='';
-        $label=$langs->trans("ShowTypeCard", $this->label);
+        $result = '';
+        $label = $langs->trans("ShowTypeCard", $this->label);
 
         $linkstart = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-        $linkend='</a>';
+        $linkend = '</a>';
 
         $result .= $linkstart;
-        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-        if ($withpicto != 2) $result.= ($maxlen?dol_trunc($this->label, $maxlen):$this->label);
+        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+        if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->label, $maxlen) : $this->label);
         $result .= $linkend;
 
         return $result;
@@ -723,10 +723,10 @@ class AdherentType extends CommonObject
 	{
         // phpcs:enable
 		global $conf;
-		$dn='';
-		if ($mode==0) $dn=$conf->global->LDAP_KEY_MEMBERS_TYPES."=".$info[$conf->global->LDAP_KEY_MEMBERS_TYPES].",".$conf->global->LDAP_MEMBER_TYPE_DN;
-		if ($mode==1) $dn=$conf->global->LDAP_MEMBER_TYPE_DN;
-		if ($mode==2) $dn=$conf->global->LDAP_KEY_MEMBERS_TYPES."=".$info[$conf->global->LDAP_KEY_MEMBERS_TYPES];
+		$dn = '';
+		if ($mode == 0) $dn = $conf->global->LDAP_KEY_MEMBERS_TYPES."=".$info[$conf->global->LDAP_KEY_MEMBERS_TYPES].",".$conf->global->LDAP_MEMBER_TYPE_DN;
+		if ($mode == 1) $dn = $conf->global->LDAP_MEMBER_TYPE_DN;
+		if ($mode == 2) $dn = $conf->global->LDAP_KEY_MEMBERS_TYPES."=".$info[$conf->global->LDAP_KEY_MEMBERS_TYPES];
 		return $dn;
 	}
 
@@ -741,27 +741,27 @@ class AdherentType extends CommonObject
 	public function _load_ldap_info()
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$info=array();
+		$info = array();
 
 		// Object classes
-		$info["objectclass"]=explode(',', $conf->global->LDAP_MEMBER_TYPE_OBJECT_CLASS);
+		$info["objectclass"] = explode(',', $conf->global->LDAP_MEMBER_TYPE_OBJECT_CLASS);
 
 		// Champs
-		if ($this->label && ! empty($conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME] = $this->label;
-		if ($this->note && ! empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note, 0, 'UTF-8', 1);
-		if (! empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS))
+		if ($this->label && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME] = $this->label;
+		if ($this->note && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note, 0, 'UTF-8', 1);
+		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS))
 		{
-			$valueofldapfield=array();
-			foreach($this->members as $key=>$val)    // This is array of users for group into dolibarr database.
+			$valueofldapfield = array();
+			foreach ($this->members as $key=>$val)    // This is array of users for group into dolibarr database.
 			{
-				$member=new Adherent($this->db);
+				$member = new Adherent($this->db);
 				$member->fetch($val->id, '', '', '', false, false);
 				$info2 = $member->_load_ldap_info();
 				$valueofldapfield[] = $member->_load_ldap_dn($info2);
 			}
-			$info[$conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield)?$valueofldapfield:'');
+			$info[$conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield) ? $valueofldapfield : '');
 		}
 		return $info;
 	}
@@ -780,18 +780,18 @@ class AdherentType extends CommonObject
 		// Initialise parametres
 		$this->id = 0;
 		$this->ref = 'MTSPEC';
-		$this->specimen=1;
+		$this->specimen = 1;
 
-		$this->label='MEMBERS TYPE SPECIMEN';
-		$this->note='This is a note';
-		$this->mail_valid='This is welcome email';
-		$this->subscription=1;
-		$this->vote=0;
+		$this->label = 'MEMBERS TYPE SPECIMEN';
+		$this->note = 'This is a note';
+		$this->mail_valid = 'This is welcome email';
+		$this->subscription = 1;
+		$this->vote = 0;
 
-		$this->statut=1;
+		$this->statut = 1;
 
 		// Members of this member type is just me
-		$this->members=array(
+		$this->members = array(
 			$user->id => $user
 		);
 	}
@@ -805,7 +805,7 @@ class AdherentType extends CommonObject
 	{
 		global $conf;
 
-		if (! empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid)))
+		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid)))
 		{
 			return $this->mail_valid;
 		}
@@ -823,7 +823,7 @@ class AdherentType extends CommonObject
 		global $conf;
 
 		// mail_subscription not  defined so never used
-		if (! empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription)))  // Property not yet defined
+		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription)))  // Property not yet defined
 		{
 			return $this->mail_subscription;
 		}
@@ -841,7 +841,7 @@ class AdherentType extends CommonObject
         global $conf;
 
         // NOTE mail_resiliate not defined so never used
-        if (! empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate)))  // Property not yet defined
+        if (!empty($this->mail_resiliate) && trim(dol_htmlentitiesbr_decode($this->mail_resiliate)))  // Property not yet defined
         {
             return $this->mail_resiliate;
         }
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 7581108dd12..16b600bfeeb 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -47,7 +47,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 	}
 	echo '</td>';
 	echo '<td class="right"></td>';
-	echo '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+	echo '<td class="right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
     echo '</tr>';
 }
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index b1b18e3ed31..ecfd12142f4 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -373,11 +373,11 @@ if ($action == 'create')
 
 	// Other attributes
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 	print '<tbody>';
 	print "</table>\n";
@@ -823,7 +823,7 @@ if ($rowid > 0)
         	print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
-		    print $object->showOptionals($extrafields, 'edit');
+		    print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
 		print '</table>';
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 43d0731c434..6bd27da529b 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -75,7 +75,7 @@ if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->statut == MyObject::STATUS_DRAFT) ? 1 : 0);
 //$result = restrictedArea($user, 'mymodule', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
@@ -418,10 +418,25 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if (function_exists('imap_open'))
 	{
 		$connectstringserver = $object->getConnectStringIMAP();
-		$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
-		$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
 
-		$connection = imap_open($connectstringsource, $object->login, $object->password);
+		try {
+			if ($sourcedir) {
+				//$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
+				$connectstringsource = $connectstringserver.$object->getEncodedUtf7($sourcedir);
+			}
+			if ($targetdir) {
+				//$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
+				$connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir);
+			}
+
+			$connection = imap_open($connectstringsource, $object->login, $object->password);
+		}
+		catch(Exception $e)
+		{
+			print $e->getMessage();
+		}
+
+		$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
 	}
 	else
 	{
@@ -509,11 +524,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
         else { jQuery("#rulevalue").prop("disabled", false); }
         jQuery("#rulevalue").attr("placeholder", (jQuery("#filtertype option:selected").attr("data-placeholder")));
     ';
-	$noparam = array();
+	/*$noparam = array();
 	foreach ($arrayoftypes as $key => $value)
 	{
 	    if ($value['noparam']) $noparam[] = $key;
-	}
+	}*/
 	print '})';
 	print '</script>'."\n";
 
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index add400b6aef..c10e44e0e10 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -321,13 +321,15 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+
 $newcardbutton = '';
 //if ($user->rights->emailcollector->creer)
 //{
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', 'emailcollector_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']));
 //}
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton.' '.$linkback, '', $limit);
 
 // Add code for pre mass action (confirmation or email presend form)
 /*$topicmail="";
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index f0b0218c0e5..5f6d52e1169 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -43,7 +43,7 @@ $type='contract';
 
 if (empty($conf->global->HOLIDAY_ADDON))
 {
-    $conf->global->HOLIDAY_ADDON='mod_holiday_madona';
+    $conf->global->HOLIDAY_ADDON = 'mod_holiday_madonna';
 }
 
 
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index c52f899a03f..5f59a198fa4 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -315,7 +315,7 @@ if ($action == 'edit')
 		// SuperAdministrator access only
 		if (empty($conf->multicompany->enabled) || ($user->admin && ! $user->entity))
 		{
-			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" size="18" value="' . $mainserver . '">';
+			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" size="18" value="' . $mainserver . '" autocomplete="off">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="' . $mainserver . '">';
 			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		}
@@ -384,11 +384,13 @@ if ($action == 'edit')
 	if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))))
 	{
 		$mainsmtppw=(! empty($conf->global->MAIN_MAIL_SMTPS_PW)?$conf->global->MAIN_MAIL_SMTPS_PW:'');
-		print '<tr class="drag drop oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
+		print '<tr class="drag drop oddeven"><td>';
+		print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_PW"), $langs->trans("WithGMailYouCanCreateADedicatedPassword"));
+		print '</td><td>';
 		// SuperAdministrator access only
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
-			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW" size="32" value="' . $mainsmtppw . '">';
+			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW" size="32" value="' . $mainsmtppw . '" autocomplete="off">';
 		}
 		else
 		{
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index c5201adedeb..e287db9c7c9 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -135,6 +135,10 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
+	// Actions cancel, add, update, delete or clone
+	$backurlforlist = $_SERVER["PHP_SELF"].'?action=list';
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
@@ -344,7 +348,7 @@ print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'"
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="action" value="'.($action == 'create' ? 'add' : 'list').'">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
@@ -354,7 +358,7 @@ $newcardbutton = '';
 if ($action != 'create') {
 	$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', $_SERVER['PHP_SELF'].'?action=create', '', $permissiontoadd);
 } else {
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	/*print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -362,13 +366,18 @@ if ($action != 'create') {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	*/
 	print '<table class="border centpercent tableforfield">';
 	print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="label" value="'.GETPOST('label', 'alphanohtml').'"></td></tr>';
 	print '<tr><td>'.$langs->trans("Email").'</td><td><input type="text" name="email" value="'.GETPOST('email', 'alphanohtml').'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Signature").'</td><td><textarea name="signature">'.GETPOST('signature', 'none').'</textarea></td></tr>';
-	print '<tr><td>'.$langs->trans("Position").'</td><td><input type="text" name="label" class="maxwidth50" value="'.GETPOST('position', 'int').'"></td></tr>';
+	print '<tr><td>'.$langs->trans("Signature").'</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('signature', GETPOST('signature'), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
+	print $doleditor->Create(1);
+	print '</td></tr>';
+	print '<tr><td>'.$langs->trans("Position").'</td><td><input type="text" name="position" class="maxwidth50" value="'.GETPOST('position', 'int').'"></td></tr>';
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
-	print '<input type="text" name="status" value="'.GETPOST('status', 'int').'">';
+	print $form->selectyesno('active', GETPOST('active', 'int'), 1);
 	print '</td></tr>';
 	print '</table>';
 	print '<br>';
@@ -377,7 +386,7 @@ if ($action != 'create') {
 	print ' &nbsp; ';
 	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
-	print '</form>';
+	//print '</form>';
 }
 
 print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit);
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 448f5d15ed9..4785ab78174 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -79,7 +79,7 @@ class Documents extends DolibarrApi
 		}
 
 		//--- Finds and returns the document
-		$entity=$conf->entity;
+		$entity = $conf->entity;
 
 		$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
 		$accessallowed = $check_access['accessallowed'];
@@ -94,16 +94,16 @@ class Documents extends DolibarrApi
 		}
 
 		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-		if (! file_exists($original_file_osencoded))
+		if (!file_exists($original_file_osencoded))
 		{
 			dol_syslog("Try to download not found file ".$original_file_osencoded, LOG_WARNING);
 			throw new RestException(404, 'File not found');
 		}
 
-		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64' );
+		$file_content = file_get_contents($original_file_osencoded);
+		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'encoding'=>'base64');
 	}
 
 
@@ -141,12 +141,12 @@ class Documents extends DolibarrApi
 		$outputlangs = $langs;
 		if ($langcode && $langs->defaultlang != $langcode)
 		{
-			$outputlangs=new Translate('', $conf);
+			$outputlangs = new Translate('', $conf);
 			$outputlangs->setDefaultLang($langcode);
 		}
 
 		//--- Finds and returns the document
-		$entity=$conf->entity;
+		$entity = $conf->entity;
 
 		$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'write');
 		$accessallowed              = $check_access['accessallowed'];
@@ -165,20 +165,20 @@ class Documents extends DolibarrApi
 		$hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
 		$hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
 
-		$templateused='';
+		$templateused = '';
 
 		if ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$this->invoice = new Facture($this->db);
 			$result = $this->invoice->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
+			if (!$result) {
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$templateused = $doctemplate?$doctemplate:$this->invoice->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->invoice->modelpdf;
 			$result = $this->invoice->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
+			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
 		}
@@ -187,12 +187,12 @@ class Documents extends DolibarrApi
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$this->order = new Commande($this->db);
 			$result = $this->order->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
+			if (!$result) {
 				throw new RestException(404, 'Order not found');
 			}
-			$templateused = $doctemplate?$doctemplate:$this->order->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->order->modelpdf;
 			$result = $this->order->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
+			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
 		}
@@ -201,12 +201,12 @@ class Documents extends DolibarrApi
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$this->propal = new Propal($this->db);
 			$result = $this->propal->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
-			if( ! $result ) {
+			if (!$result) {
 				throw new RestException(404, 'Proposal not found');
 			}
-			$templateused = $doctemplate?$doctemplate:$this->propal->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->propal->modelpdf;
 			$result = $this->propal->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if( $result <= 0 ) {
+			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
 			}
 		}
@@ -216,15 +216,15 @@ class Documents extends DolibarrApi
 		}
 
 		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-		if (! file_exists($original_file_osencoded))
+		if (!file_exists($original_file_osencoded))
 		{
 			throw new RestException(404, 'File not found');
 		}
 
-		$file_content=file_get_contents($original_file_osencoded);
-		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64' );
+		$file_content = file_get_contents($original_file_osencoded);
+		return array('filename'=>$filename, 'content-type' => dol_mimetype($filename), 'filesize'=>filesize($original_file), 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'base64');
 	}
 
 	/**
@@ -257,7 +257,7 @@ class Documents extends DolibarrApi
 			throw new RestException(400, 'bad value for parameter id or ref');
 		}
 
-		$id = (empty($id)?0:$id);
+		$id = (empty($id) ? 0 : $id);
 
 		if ($modulepart == 'societe' || $modulepart == 'thirdparty')
 		{
@@ -268,12 +268,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Societe($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Thirdparty not found');
 			}
 
-			$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id;
+			$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
 		}
 		elseif ($modulepart == 'adherent' || $modulepart == 'member')
 		{
@@ -284,12 +284,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Adherent($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Member not found');
 			}
 
-			$upload_dir = $conf->adherent->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'member');
+			$upload_dir = $conf->adherent->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'member');
 		}
 		elseif ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
@@ -300,12 +300,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Propal($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Proposal not found');
 			}
 
-			$upload_dir = $conf->propal->multidir_output[$object->entity] . "/" . get_exdir(0, 0, 0, 1, $object, 'propal');
+			$upload_dir = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');
 		}
 		elseif ($modulepart == 'commande' || $modulepart == 'order')
 		{
@@ -316,12 +316,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Commande($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Order not found');
 			}
 
-			$upload_dir = $conf->commande->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'commande');
+			$upload_dir = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
 		}
 		elseif ($modulepart == 'shipment' || $modulepart == 'expedition')
 		{
@@ -332,12 +332,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Expedition($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Shipment not found');
 			}
 
-			$upload_dir = $conf->expedition->dir_output . "/sending/" . get_exdir(0, 0, 0, 1, $object, 'shipment');
+			$upload_dir = $conf->expedition->dir_output."/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');
 		}
 		elseif ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
@@ -348,12 +348,12 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Facture($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$upload_dir = $conf->facture->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'invoice');
+			$upload_dir = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 		}
         elseif ($modulepart == 'produit' || $modulepart == 'product')
 		{
@@ -364,8 +364,8 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new Product($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Product not found');
 			}
 
@@ -380,8 +380,8 @@ class Documents extends DolibarrApi
 			}
 
 			$object = new ActionComm($this->db);
-			$result=$object->fetch($id, $ref);
-			if ( ! $result ) {
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
 				throw new RestException(404, 'Event not found');
 			}
 
@@ -392,9 +392,9 @@ class Documents extends DolibarrApi
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
 
-		$filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
+		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		if (empty($filearray)) {
-			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(! empty($object->Ref)?' or Ref '.$object->ref:'').' does not return any document.');
+			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->Ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
 		}
 
 		return $filearray;
@@ -447,7 +447,7 @@ class Documents extends DolibarrApi
         var_dump($filecontent);
         exit;*/
 
-		if(empty($modulepart))
+		if (empty($modulepart))
 		{
 			throw new RestException(400, 'Modulepart not provided.');
 		}
@@ -467,11 +467,11 @@ class Documents extends DolibarrApi
 		$entity = DolibarrApiAccess::$user->entity;
 		if ($ref)
 		{
-			$tmpreldir='';
+			$tmpreldir = '';
 
 			if ($modulepart == 'facture' || $modulepart == 'invoice')
 			{
-				$modulepart='facture';
+				$modulepart = 'facture';
 
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
@@ -491,11 +491,11 @@ class Documents extends DolibarrApi
 				$task_result = $object->fetch('', $ref);
 
 				// Fetching the tasks project is required because its out_dir might be a sub-directory of the project
-				if($task_result > 0)
+				if ($task_result > 0)
 				{
 					$project_result = $object->fetch_projet();
 
-					if($project_result >= 0)
+					if ($project_result >= 0)
 					{
 						$tmpreldir = dol_sanitizeFileName($object->project->ref).'/';
 					}
@@ -516,11 +516,11 @@ class Documents extends DolibarrApi
 				throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 			}
 
-			if(is_object($object))
+			if (is_object($object))
 			{
 				$result = $object->fetch('', $ref);
 
-				if($result == 0)
+				if ($result == 0)
 				{
 					throw new RestException(404, "Object with ref '".$ref."' was not found.");
 			    }
@@ -530,7 +530,7 @@ class Documents extends DolibarrApi
 				}
 			}
 
-			if (! ($object->id > 0))
+			if (!($object->id > 0))
 			{
    				throw new RestException(404, 'The object '.$modulepart." with ref '".$ref."' was not found.");
 			}
@@ -538,7 +538,7 @@ class Documents extends DolibarrApi
 			$relativefile = $tmpreldir.dol_sanitizeFileName($object->ref);
 
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, $ref, 'write');
-			$upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
+			$upload_dir = $tmp['original_file']; // No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
 
 			if (empty($upload_dir) || $upload_dir == '/')
 			{
@@ -547,12 +547,12 @@ class Documents extends DolibarrApi
 		}
 		else
 		{
-			if ($modulepart == 'invoice') $modulepart ='facture';
+			if ($modulepart == 'invoice') $modulepart = 'facture';
 
 			$relativefile = $subdir;
 
 			$tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'write');
-			$upload_dir = $tmp['original_file'];	// No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
+			$upload_dir = $tmp['original_file']; // No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir
 
 			if (empty($upload_dir) || $upload_dir == '/')
 			{
@@ -568,8 +568,8 @@ class Documents extends DolibarrApi
 		    throw new RestException(500, 'Error while trying to create directory.');
 		}
 
-		$destfile = $upload_dir . '/' . $original_file;
-		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
+		$destfile = $upload_dir.'/'.$original_file;
+		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/'.$original_file;
 		dol_delete_file($destfiletmp);
 		//var_dump($original_file);exit;
 
@@ -577,7 +577,7 @@ class Documents extends DolibarrApi
 			throw new RestException(401, 'Directory not exists : '.dirname($destfile));
 		}
 
-		if (! $overwriteifexists && dol_is_file($destfile))
+		if (!$overwriteifexists && dol_is_file($destfile))
 		{
 			throw new RestException(500, "File with name '".$original_file."' already exists.");
 		}
@@ -595,7 +595,7 @@ class Documents extends DolibarrApi
 		}
 
 		$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
-		if (! $result)
+		if (!$result)
 		{
 			throw new RestException(500, "Failed to move file into '".$destfile."'");
 		}
@@ -629,7 +629,7 @@ class Documents extends DolibarrApi
 	    }
 
 	    //--- Finds and returns the document
-	    $entity=$conf->entity;
+	    $entity = $conf->entity;
 
 	    $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
 	    $accessallowed = $check_access['accessallowed'];
@@ -644,9 +644,9 @@ class Documents extends DolibarrApi
 	    }
 
 	    $filename = basename($original_file);
-	    $original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+	    $original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-	    if (! file_exists($original_file_osencoded))
+	    if (!file_exists($original_file_osencoded))
 	    {
 	        dol_syslog("Try to download not found file ".$original_file_osencoded, LOG_WARNING);
 	        throw new RestException(404, 'File not found');
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 1f6966fcd15..b23bf03f29b 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -60,7 +60,7 @@ foreach ($object->fields as $key => $val)
 if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'asset', $id);
 
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 3c91c91a675..c6488f9e0be 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -40,7 +40,7 @@ $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'))
 $ref = GETPOST('ref', 'alpha');
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'asset', $id);
 
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 79e80518557..9af78befa0b 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -46,7 +46,7 @@ $hookmanager->initHooks(array('assetnote')); // Note that conf->hooks_modules co
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'asset', $id);
 
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 70191b5eb28..1ca019f5988 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -391,11 +391,11 @@ if ($action == 'create')
 
 	// Other attributes
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 	print '<tbody>';
 	print "</table>\n";
@@ -606,7 +606,7 @@ if ($rowid > 0)
 		print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
-			print $object->showOptionals($extrafields, 'edit');
+			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
 		print '</table>';
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index d0cf2995081..8e0afc77d0a 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -53,7 +53,7 @@ else
 $search_agenda_label=GETPOST('search_agenda_label');
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'bom', $id);
 
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 38ccb13b6b5..252caa8da10 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -70,16 +70,16 @@ if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
 //$result = restrictedArea($user, 'bom', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
-$permissionnote=$user->rights->bom->write;	// Used by the include of actions_setnotes.inc.php
-$permissiondellink=$user->rights->bom->write;	// Used by the include of actions_dellink.inc.php
-$permissiontoadd=$user->rights->bom->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissionnote = $user->rights->bom->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->bom->write; // Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->rights->bom->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->bom->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$upload_dir = $conf->bom->multidir_output[isset($object->entity)?$object->entity:1];
+$upload_dir = $conf->bom->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
 /*
@@ -521,29 +521,29 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 * Lines
 	 */
 
-	if (! empty($object->table_element_line))
+	if (!empty($object->table_element_line))
 	{
 	    // Show object lines
 	    $result = $object->getLinesArray();
 
-	    print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#addline' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
-    	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
-    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+	    print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+    	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'].'">
+    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
-    	<input type="hidden" name="id" value="' . $object->id . '">
+    	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
-	    if (! empty($conf->use_javascript_ajax) && $object->status == 0) {
-	        include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+	    if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+	        include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 	    }
 
 	    print '<div class="div-table-responsive-no-min">';
-	    if (! empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+	    if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
 	    {
 	        print '<table id="tablelines" class="noborder noshadow" width="100%">';
 	    }
 
-	    if (! empty($object->lines))
+	    if (!empty($object->lines))
 	    {
 	        $object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
 	    }
@@ -561,7 +561,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	        }
 	    }
 
-	    if (! empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+	    if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
 	    {
 	        print '</table>';
 	    }
@@ -613,11 +613,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    		{
 	    			if (is_array($object->lines) && count($object->lines) > 0)
 	    			{
-	    				print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=validate">' . $langs->trans("Validate") . '</a>';
+	    				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
 	    			}
 	    			else
 	    			{
-	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("AddAtLeastOneLineFirst").'">' . $langs->trans("Validate") . '</a>';
+	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("AddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 	    			}
 	    		}
     		}
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 9c2280e889b..6ac836fdcae 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -41,7 +41,7 @@ $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'))
 $ref = GETPOST('ref', 'alpha');
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'bom', $id);
 
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index e37a64d0f28..8d4e2241e97 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -47,7 +47,7 @@ $hookmanager->initHooks(array('bomnote', 'globalcard')); // Note that conf->hook
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'bom', $id);
 
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 524fd5c0f93..be4e9eed510 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -95,7 +95,7 @@ class BOM extends CommonObject
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp'),
 	    'qty' => array('type'=>'real', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>1, 'default'=>1, 'position'=>55, 'notnull'=>1, 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
 		'efficiency' => array('type'=>'real', 'label'=>'ManufacturingEfficiency', 'enabled'=>1, 'visible'=>-1, 'default'=>1, 'position'=>100, 'notnull'=>0, 'css'=>'maxwidth50imp', 'help'=>'ValueOfMeansLoss'),
-		'duration' => array('type'=>'real', 'label'=>'EstimatedDuration', 'enabled'=>1, 'visible'=>-1, 'position'=>101, 'notnull'=>-1, 'css'=>'maxwidth50imp', 'help'=>'EstimatedDurationDesc'),
+		'duration' => array('type'=>'duration', 'label'=>'EstimatedDuration', 'enabled'=>1, 'visible'=>-1, 'position'=>101, 'notnull'=>-1, 'css'=>'maxwidth50imp', 'help'=>'EstimatedDurationDesc'),
 		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'enabled'=>1, 'visible'=>-1, 'position'=>102),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>-2, 'position'=>161, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>-2, 'position'=>162, 'notnull'=>-1,),
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 3578e0e0c60..d252171b38f 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -278,7 +278,7 @@ if ($user->rights->categorie->creer)
         print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
-			print $object->showOptionals($extrafields, 'edit');
+			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
 		print '</table>';
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index e916255f7b5..459b61ba740 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -78,16 +78,16 @@ class Categories extends DolibarrApi
      */
     public function get($id, $include_childs = false)
     {
-        if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
             throw new RestException(401);
         }
 
         $result = $this->category->fetch($id);
-        if ( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 
-        if ( ! DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
+        if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
@@ -126,50 +126,50 @@ class Categories extends DolibarrApi
 
         $obj_ret = array();
 
-        if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
             throw new RestException(401);
         }
 
         $sql = "SELECT t.rowid";
-        $sql.= " FROM ".MAIN_DB_PREFIX."categorie as t";
-        $sql.= ' WHERE t.entity IN ('.getEntity('category').')';
+        $sql .= " FROM ".MAIN_DB_PREFIX."categorie as t";
+        $sql .= ' WHERE t.entity IN ('.getEntity('category').')';
         if (!empty($type))
         {
-            $sql.= ' AND t.type='.array_search($type, Categories::$TYPES);
+            $sql .= ' AND t.type='.array_search($type, Categories::$TYPES);
         }
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-            $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         $result = $db->query($sql);
         if ($result)
         {
-            $i=0;
+            $i = 0;
             $num = $db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
                 $category_static = new Categorie($db);
-                if($category_static->fetch($obj->rowid)) {
+                if ($category_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($category_static);
                 }
                 $i++;
@@ -178,7 +178,7 @@ class Categories extends DolibarrApi
         else {
             throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No category found');
         }
         return $obj_ret;
@@ -192,14 +192,14 @@ class Categories extends DolibarrApi
      */
     public function post($request_data = null)
     {
-        if(! DolibarrApiAccess::$user->rights->categorie->creer) {
+        if (!DolibarrApiAccess::$user->rights->categorie->creer) {
             throw new RestException(401);
         }
 
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             $this->category->$field = $value;
         }
         if ($this->category->create(DolibarrApiAccess::$user) < 0) {
@@ -217,20 +217,20 @@ class Categories extends DolibarrApi
      */
     public function put($id, $request_data = null)
     {
-        if(! DolibarrApiAccess::$user->rights->categorie->creer) {
+        if (!DolibarrApiAccess::$user->rights->categorie->creer) {
             throw new RestException(401);
         }
 
         $result = $this->category->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 
-        if ( ! DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+        if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             if ($field == 'id') continue;
             $this->category->$field = $value;
         }
@@ -253,19 +253,19 @@ class Categories extends DolibarrApi
      */
     public function delete($id)
     {
-        if(! DolibarrApiAccess::$user->rights->categorie->supprimer) {
+        if (!DolibarrApiAccess::$user->rights->categorie->supprimer) {
             throw new RestException(401);
         }
         $result = $this->category->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 
-        if ( ! DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+        if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-        if (! $this->category->delete(DolibarrApiAccess::$user)) {
+        if (!$this->category->delete(DolibarrApiAccess::$user)) {
             throw new RestException(401, 'error when delete category');
         }
 
@@ -306,21 +306,21 @@ class Categories extends DolibarrApi
             throw new RestException(401);
         }
 
-        if($type == Categorie::TYPE_PRODUCT && ! (DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
+        if ($type == Categorie::TYPE_PRODUCT && !(DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
             throw new RestException(401);
-        } elseif ($type == Categorie::TYPE_CONTACT && ! DolibarrApiAccess::$user->rights->contact->lire) {
+        } elseif ($type == Categorie::TYPE_CONTACT && !DolibarrApiAccess::$user->rights->contact->lire) {
             throw new RestException(401);
-        } elseif ($type == Categorie::TYPE_CUSTOMER && ! DolibarrApiAccess::$user->rights->societe->lire) {
+        } elseif ($type == Categorie::TYPE_CUSTOMER && !DolibarrApiAccess::$user->rights->societe->lire) {
             throw new RestException(401);
-        } elseif ($type == Categorie::TYPE_SUPPLIER && ! DolibarrApiAccess::$user->rights->fournisseur->lire) {
+        } elseif ($type == Categorie::TYPE_SUPPLIER && !DolibarrApiAccess::$user->rights->fournisseur->lire) {
             throw new RestException(401);
-        } elseif ($type == Categorie::TYPE_MEMBER && ! DolibarrApiAccess::$user->rights->adherent->lire) {
+        } elseif ($type == Categorie::TYPE_MEMBER && !DolibarrApiAccess::$user->rights->adherent->lire) {
             throw new RestException(401);
         }
 
         $categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
 
-        if( ! is_array($categories)) {
+        if (!is_array($categories)) {
             if ($categories == 0) {
                 throw new RestException(404, 'No category found for this object');
             }
@@ -347,37 +347,37 @@ class Categories extends DolibarrApi
             throw new RestException(401);
         }
 
-        if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
             throw new RestException(401);
         }
 
         $result = $this->category->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 
         if ($type === Categorie::TYPE_PRODUCT) {
-            if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+            if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
             }
             $object = new Product($this->db);
         } elseif ($type === Categorie::TYPE_CUSTOMER) {
-            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->creer) {
                 throw new RestException(401);
             }
             $object = new Societe($this->db);
         } elseif ($type === Categorie::TYPE_SUPPLIER) {
-            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->creer) {
                 throw new RestException(401);
             }
             $object = new Societe($this->db);
         } elseif ($type === Categorie::TYPE_CONTACT) {
-            if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
                 throw new RestException(401);
             }
             $object = new Contact($this->db);
         } elseif ($type === Categorie::TYPE_MEMBER) {
-            if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+            if (!DolibarrApiAccess::$user->rights->adherent->creer) {
                 throw new RestException(401);
             }
             $object = new Adherent($this->db);
@@ -388,7 +388,7 @@ class Categories extends DolibarrApi
         if (!empty($object)) {
             $result = $object->fetch($object_id);
             if ($result > 0) {
-                $result=$this->category->add_type($object, $type);
+                $result = $this->category->add_type($object, $type);
                 if ($result < 0) {
                     if ($this->category->error != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                         throw new RestException(500, 'Error when linking object', array_merge(array($this->category->error), $this->category->errors));
@@ -427,37 +427,37 @@ class Categories extends DolibarrApi
             throw new RestException(401);
         }
 
-        if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
             throw new RestException(401);
         }
 
         $result = $this->category->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 
         if ($type === Categorie::TYPE_PRODUCT) {
-            if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+            if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
             }
             $object = new Product($this->db);
         } elseif ($type === Categorie::TYPE_CUSTOMER) {
-            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->creer) {
                 throw new RestException(401);
             }
             $object = new Societe($this->db);
         } elseif ($type === Categorie::TYPE_SUPPLIER) {
-            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->creer) {
                 throw new RestException(401);
             }
             $object = new Societe($this->db);
         } elseif ($type === Categorie::TYPE_CONTACT) {
-            if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
                 throw new RestException(401);
             }
             $object = new Contact($this->db);
         } elseif ($type === Categorie::TYPE_MEMBER) {
-            if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+            if (!DolibarrApiAccess::$user->rights->adherent->creer) {
                 throw new RestException(401);
             }
             $object = new Adherent($this->db);
@@ -468,7 +468,7 @@ class Categories extends DolibarrApi
         if (!empty($object)) {
             $result = $object->fetch('', $object_ref);
             if ($result > 0) {
-                $result=$this->category->add_type($object, $type);
+                $result = $this->category->add_type($object, $type);
                 if ($result < 0) {
                     if ($this->category->error != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                         throw new RestException(500, 'Error when linking object', array_merge(array($this->category->error), $this->category->errors));
@@ -507,37 +507,37 @@ class Categories extends DolibarrApi
             throw new RestException(401);
         }
 
-        if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
             throw new RestException(401);
         }
 
         $result = $this->category->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 
         if ($type === Categorie::TYPE_PRODUCT) {
-            if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+            if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
             }
             $object = new Product($this->db);
         } elseif ($type === Categorie::TYPE_CUSTOMER) {
-            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->creer) {
                 throw new RestException(401);
             }
             $object = new Societe($this->db);
         } elseif ($type === Categorie::TYPE_SUPPLIER) {
-            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->creer) {
                 throw new RestException(401);
             }
             $object = new Societe($this->db);
         } elseif ($type === Categorie::TYPE_CONTACT) {
-            if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
                 throw new RestException(401);
             }
             $object = new Contact($this->db);
         } elseif ($type === Categorie::TYPE_MEMBER) {
-            if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+            if (!DolibarrApiAccess::$user->rights->adherent->creer) {
                 throw new RestException(401);
             }
             $object = new Adherent($this->db);
@@ -548,7 +548,7 @@ class Categories extends DolibarrApi
         if (!empty($object)) {
             $result = $object->fetch((int) $object_id);
             if ($result > 0) {
-                $result=$this->category->del_type($object, $type);
+                $result = $this->category->del_type($object, $type);
                 if ($result < 0) {
                     throw new RestException(500, 'Error when unlinking object', array_merge(array($this->category->error), $this->category->errors));
                 }
@@ -585,37 +585,37 @@ class Categories extends DolibarrApi
             throw new RestException(401);
         }
 
-        if(! DolibarrApiAccess::$user->rights->categorie->lire) {
+        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
             throw new RestException(401);
         }
 
         $result = $this->category->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 
         if ($type === Categorie::TYPE_PRODUCT) {
-            if(! (DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+            if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
                 throw new RestException(401);
             }
             $object = new Product($this->db);
         } elseif ($type === Categorie::TYPE_CUSTOMER) {
-            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->creer) {
                 throw new RestException(401);
             }
             $object = new Societe($this->db);
         } elseif ($type === Categorie::TYPE_SUPPLIER) {
-            if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->creer) {
                 throw new RestException(401);
             }
             $object = new Societe($this->db);
         } elseif ($type === Categorie::TYPE_CONTACT) {
-            if(! DolibarrApiAccess::$user->rights->societe->contact->creer) {
+            if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
                 throw new RestException(401);
             }
             $object = new Contact($this->db);
         } elseif ($type === Categorie::TYPE_MEMBER) {
-            if(! DolibarrApiAccess::$user->rights->adherent->creer) {
+            if (!DolibarrApiAccess::$user->rights->adherent->creer) {
                 throw new RestException(401);
             }
             $object = new Adherent($this->db);
@@ -626,7 +626,7 @@ class Categories extends DolibarrApi
         if (!empty($object)) {
             $result = $object->fetch('', (string) $object_ref);
             if ($result > 0) {
-                $result=$this->category->del_type($object, $type);
+                $result = $this->category->del_type($object, $type);
                 if ($result < 0) {
                     throw new RestException(500, 'Error when unlinking object', array_merge(array($this->category->error), $this->category->errors));
                 }
@@ -736,7 +736,7 @@ class Categories extends DolibarrApi
     {
 		dol_syslog("getObjects($id, $type, $onlyids)", LOG_DEBUG);
 
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 
@@ -746,11 +746,11 @@ class Categories extends DolibarrApi
         }
 
         $result = $this->category->fetch($id);
-        if (! $result) {
+        if (!$result) {
             throw new RestException(404, 'category not found');
         }
 
-		if (! DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $this->category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 6bbc0afcb1c..56f26eb2dd9 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -781,18 +781,19 @@ class Categorie extends CommonObject
 
 		$objs = array();
 
-		$obj = new $this->MAP_OBJ_CLASS[$type]( $this->db );
+		$tmpclass = $this->MAP_OBJ_CLASS[$type];
+		$obj = new $tmpclass($this->db);
 
-		$sql = "SELECT c.fk_" . $this->MAP_CAT_FK[$type];
-		$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as c";
-		$sql .= ", " . MAIN_DB_PREFIX . $this->MAP_OBJ_TABLE[$type] . " as o";
-		$sql .= " WHERE o.entity IN (" . getEntity($obj->element).")";
+		$sql = "SELECT c.fk_".$this->MAP_CAT_FK[$type];
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".$this->MAP_CAT_TABLE[$type]." as c";
+		$sql .= ", ".MAIN_DB_PREFIX.$this->MAP_OBJ_TABLE[$type]." as o";
+		$sql .= " WHERE o.entity IN (".getEntity($obj->element).")";
 		$sql .= " AND c.fk_categorie = ".$this->id;
-		$sql .= " AND c.fk_" . $this->MAP_CAT_FK[$type] . " = o.rowid";
+		$sql .= " AND c.fk_".$this->MAP_CAT_FK[$type]." = o.rowid";
 		// Protection for external users
 		if (($type == 'customer' || $type == 'supplier') && $user->socid > 0)
 		{
-			$sql.= " AND o.rowid = ".$user->socid;
+			$sql .= " AND o.rowid = ".$user->socid;
 		}
 		if ($limit > 0 || $offset > 0)  $sql .= $this->db->plimit($limit + 1, $offset);
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -929,7 +930,7 @@ class Categorie extends CommonObject
 					$categories[$i]['description'] = $category_static->description;
 					$categories[$i]['color']    		= $category_static->color;
 					$categories[$i]['socid']			= $category_static->socid;
-					$categories[$i]['ref_ext']			= $category_static->ref_ext;
+					$categories[$i]['ref_ext'] = $category_static->ref_ext;
 					$categories[$i]['visible'] = $category_static->visible;
 					$categories[$i]['type'] = $category_static->type;
 					$categories[$i]['entity'] = $category_static->entity;
@@ -1569,7 +1570,7 @@ class Categorie extends CommonObject
 			$sql .= " AND rowid = '".$id."'";
 		}
 
-		$res  = $this->db->query($sql);
+		$res = $this->db->query($sql);
 		if ($res)
 		{
 			while ($rec = $this->db->fetch_array($res))
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index a45ca818dbc..9c653decdff 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -180,7 +180,7 @@ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object,
 print $hookmanager->resPrint;
 if (empty($reshook))
 {
-	print $object->showOptionals($extrafields, 'edit');
+	print $object->showOptionals($extrafields, 'edit', $parameters);
 }
 
 print '</table>';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index fa0e9c78de2..92144f50934 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1115,7 +1115,7 @@ if ($action == 'create')
     print $hookmanager->resPrint;
     if (empty($reshook))
 	{
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	print '</table>';
@@ -1437,7 +1437,7 @@ if ($id > 0)
 			// related contact
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td>';
 			print '<div class="maxwidth200onsmartphone">';
-			print $form->selectcontacts($object->socid, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 0, 'quatrevingtpercent', false, 0, 0, array(), 'multiple', 'contactid');
+			print $form->selectcontacts($object->socid, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'quatrevingtpercent', false, 0, 0, array(), 'multiple', 'contactid');
 			print '</div>';
 			print '</td>';
 			print '</tr>';
@@ -1519,7 +1519,7 @@ if ($id > 0)
         print $hookmanager->resPrint;
         if (empty($reshook))
 		{
-			print $object->showOptionals($extrafields, 'edit');
+			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
 		print '</table>';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index a2d8c0a373b..8deb8100c72 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1242,7 +1242,7 @@ else
             print $hookmanager->resPrint;
 			if (empty($reshook))
 			{
-				print $object->showOptionals($extrafields, 'edit');
+				print $object->showOptionals($extrafields, 'edit', $parameters);
 			}
 
 			print '</table>';
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 9c589c4ae3d..08736a3d268 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -294,7 +294,6 @@ class FormAdvTargetEmailing extends Form
 
 		$options_array = array();
 
-
 		$sql = "SELECT rowid, code, label as civilite, active FROM ".MAIN_DB_PREFIX."c_civility";
 		$sql .= " WHERE active = 1";
 
@@ -312,7 +311,6 @@ class FormAdvTargetEmailing extends Form
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 					$label = ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->civilite != '-' ? $obj->civilite : ''));
 
-
 					$options_array[$obj->code] = $label;
 
 					$i++;
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index b38a796d3c7..cbd0c244bb3 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -271,6 +271,12 @@ if ($result)
 		print "</tr>\n";
 		$i++;
 	}
+	if (empty($num)) {
+		$colspan = 6;
+		if (!$filteremail) $colspan++;
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	}
+
 	print '</table>';
 	print '</div>';
 	print '</form>';
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index ccc62ab98c4..c28c3fe4587 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -68,7 +68,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 	}
     print '</td>';
     print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    print '<td class="linkedcol-action right"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+    print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
     print "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1)
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index ac79c1fe0a7..47a31f11a72 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -736,35 +736,34 @@ if ($socid > 0)
 
 		// Discount linked to invoice lines
 		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
-		$sql .= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture,";
 		$sql .= " rc.fk_facture_source,";
 		$sql .= " u.login, u.rowid as user_id,";
-		$sql .= " f.rowid, f.ref,";
-		$sql .= " fa.ref as ref, fa.type as type";
+		$sql .= " f.rowid as invoiceid, f.ref,";
+		$sql .= " fa.ref as invoice_source_ref, fa.type as type";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " , ".MAIN_DB_PREFIX."user as u";
 		$sql .= " , ".MAIN_DB_PREFIX."facturedet as fc";
 		$sql .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
-		$sql .= " WHERE rc.fk_soc =".$object->id;
+		$sql .= " WHERE rc.fk_soc =". $object->id;
 		$sql .= " AND rc.fk_facture_line = fc.rowid";
 		$sql .= " AND fc.fk_facture = f.rowid";
 		$sql .= " AND rc.fk_user = u.rowid";
 		$sql .= " AND rc.discount_type = 0"; // Eliminate supplier discounts
 		$sql .= " ORDER BY dc DESC";
 		//$sql.= " UNION ";
-		// Remises liees a factures
+		// Discount linked to invoices
 		$sql2 = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
 		$sql2 .= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture,";
 		$sql2 .= " rc.fk_facture_source,";
 		$sql2 .= " u.login, u.rowid as user_id,";
-		$sql2 .= " f.rowid, f.ref,";
-		$sql2 .= " fa.ref as ref, fa.type as type";
+		$sql2 .= " f.rowid as invoiceid, f.ref,";
+		$sql2 .= " fa.ref as invoice_source_ref, fa.type as type";
 		$sql2 .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql2 .= " , ".MAIN_DB_PREFIX."user as u";
 		$sql2 .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
-		$sql2 .= " WHERE rc.fk_soc =".$object->id;
+		$sql2 .= " WHERE rc.fk_soc =". $object->id;
 		$sql2 .= " AND rc.fk_facture = f.rowid";
 		$sql2 .= " AND rc.fk_user = u.rowid";
 		$sql2 .= " AND rc.discount_type = 0"; // Eliminate supplier discounts
@@ -833,7 +832,7 @@ if ($socid > 0)
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->ref;
+	    				$facturestatic->ref = $obj->invoice_source_ref;
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
@@ -842,7 +841,7 @@ if ($socid > 0)
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->ref;
+	    				$facturestatic->ref = $obj->invoice_source_ref;
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
@@ -851,7 +850,7 @@ if ($socid > 0)
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
-	    				$facturestatic->ref = $obj->ref;
+	    				$facturestatic->ref = $obj->invoice_source_ref;
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
@@ -862,7 +861,12 @@ if ($socid > 0)
 	    				print $obj->description;
 	    				print '</td>';
 	    			}
-	    			print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a></td>';
+	    			print '<td class="left nowrap">';
+	    			if ($obj->invoiceid)
+	    			{
+	    				print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->invoiceid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a>';
+	    			}
+	    			print '</td>';
 	    			print '<td class="right">'.price($obj->amount_ht).'</td>';
 	    			if (!empty($conf->multicurrency->enabled))
 	    			{
@@ -909,32 +913,32 @@ if ($socid > 0)
 		$sql .= " rc.datec as dc, rc.description, rc.fk_invoice_supplier_line, rc.fk_invoice_supplier,";
 		$sql .= " rc.fk_invoice_supplier_source,";
 		$sql .= " u.login, u.rowid as user_id,";
-		$sql .= " f.rowid, f.ref as ref,";
-		$sql .= " fa.ref, fa.type as type";
+		$sql .= " f.rowid as invoiceid, f.ref as ref,";
+		$sql .= " fa.ref as invoice_source_ref, fa.type as type";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " , ".MAIN_DB_PREFIX."user as u";
 		$sql .= " , ".MAIN_DB_PREFIX."facture_fourn_det as fc";
 		$sql .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
-		$sql .= " WHERE rc.fk_soc =".$object->id;
+		$sql .= " WHERE rc.fk_soc =". $object->id;
 		$sql .= " AND rc.fk_invoice_supplier_line = fc.rowid";
 		$sql .= " AND fc.fk_facture_fourn = f.rowid";
 		$sql .= " AND rc.fk_user = u.rowid";
 		$sql .= " AND rc.discount_type = 1"; // Eliminate customer discounts
 		$sql .= " ORDER BY dc DESC";
 		//$sql.= " UNION ";
-		// Remises liees a factures
+		// Discount linked to invoices
 		$sql2 = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
 		$sql2 .= " rc.datec as dc, rc.description, rc.fk_invoice_supplier_line, rc.fk_invoice_supplier,";
 		$sql2 .= " rc.fk_invoice_supplier_source,";
 		$sql2 .= " u.login, u.rowid as user_id,";
-		$sql2 .= " f.rowid, f.ref as ref,";
-		$sql2 .= " fa.ref, fa.type as type";
+		$sql2 .= " f.rowid as invoiceid, f.ref as ref,";
+		$sql2 .= " fa.ref as invoice_source_ref, fa.type as type";
 		$sql2 .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql2 .= " , ".MAIN_DB_PREFIX."user as u";
 		$sql2 .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
 		$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
-		$sql2 .= " WHERE rc.fk_soc =".$object->id;
+		$sql2 .= " WHERE rc.fk_soc =". $object->id;
 		$sql2 .= " AND rc.fk_invoice_supplier = f.rowid";
 		$sql2 .= " AND rc.fk_user = u.rowid";
 		$sql2 .= " AND rc.discount_type = 1"; // Eliminate customer discounts
@@ -1003,7 +1007,7 @@ if ($socid > 0)
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
-						$facturefournstatic->ref = $obj->ref;
+						$facturefournstatic->ref = $obj->invoice_source_ref;
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
@@ -1012,7 +1016,7 @@ if ($socid > 0)
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
-						$facturefournstatic->ref = $obj->ref;
+						$facturefournstatic->ref = $obj->invoice_source_ref;
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
@@ -1021,7 +1025,7 @@ if ($socid > 0)
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
-						$facturefournstatic->ref = $obj->ref;
+						$facturefournstatic->ref = $obj->invoice_source_ref;
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(EXCESS PAID\)/', $langs->trans("Invoice"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
@@ -1032,7 +1036,11 @@ if ($socid > 0)
 						print $obj->description;
 						print '</td>';
 					}
-					print '<td class="left nowrap"><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a></td>';
+					print '<td class="left nowrap">';
+					if ($obj->invoiceid) {
+						print '<a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$obj->invoiceid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a>';
+					}
+					print '</td>';
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
 					if (!empty($conf->multicurrency->enabled))
 					{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f949e118599..803d699077f 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1771,7 +1771,7 @@ if ($action == 'create' && $usercancreate)
 			}
 		};
 
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	// Template to use by default
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index b6d91b235ba..5069135dd88 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -76,7 +76,7 @@ class Orders extends DolibarrApi
      * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
      * @return 	array|mixed data without useless information
      *
-     * @url GET    byRef/{ref}
+     * @url GET    ref/{ref}
      *
      * @throws 	RestException
      */
@@ -94,7 +94,7 @@ class Orders extends DolibarrApi
      * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
      * @return 	array|mixed data without useless information
      *
-     * @url GET    byRefExt/{ref_ext}
+     * @url GET    ref_ext/{ref_ext}
      *
      * @throws 	RestException
      */
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 0c093d561c0..ef15d983d20 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -977,35 +977,22 @@ class Commande extends CommonOrder
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id;
 				if ($this->db->query($sql))
 				{
-					if ($this->id)
+					$this->ref = $initialref;
+
+					if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
 					{
-						$this->ref = $initialref;
+						$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+					}
 
-						if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
+					// Add object linked
+					if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+					{
+						foreach ($this->linked_objects as $origin => $tmp_origin_id)
 						{
-							$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
-						}
-
-						// Add object linked
-						if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
-						{
-							foreach ($this->linked_objects as $origin => $tmp_origin_id)
+							if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
 							{
-								if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+								foreach ($tmp_origin_id as $origin_id)
 								{
-									foreach ($tmp_origin_id as $origin_id)
-									{
-										$ret = $this->add_object_linked($origin, $origin_id);
-										if (!$ret)
-										{
-											$this->error = $this->db->lasterror();
-											$error++;
-										}
-									}
-								}
-								else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-								{
-									$origin_id = $tmp_origin_id;
 									$ret = $this->add_object_linked($origin, $origin_id);
 									if (!$ret)
 									{
@@ -1014,44 +1001,54 @@ class Commande extends CommonOrder
 									}
 								}
 							}
+							else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+							{
+								$origin_id = $tmp_origin_id;
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (!$ret)
+								{
+									$this->error = $this->db->lasterror();
+									$error++;
+								}
+							}
 						}
+					}
 
-						if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
+					if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
+					{
+						$originforcontact = $this->origin;
+						$originidforcontact = $this->origin_id;
+						if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
 						{
-							$originforcontact = $this->origin;
-							$originidforcontact = $this->origin_id;
-							if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+							require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+							$exp = new Expedition($this->db);
+							$exp->fetch($this->origin_id);
+							$exp->fetchObjectLinked();
+							if (count($exp->linkedObjectsIds['commande']) > 0)
 							{
-								require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-								$exp = new Expedition($this->db);
-								$exp->fetch($this->origin_id);
-								$exp->fetchObjectLinked();
-								if (count($exp->linkedObjectsIds['commande']) > 0)
+								foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
 								{
-									foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-									{
-										$originforcontact = 'commande';
-										if (is_object($value)) $originidforcontact = $value->id;
-										else $originidforcontact = $value;
-										break; // We take first one
-									}
+									$originforcontact = 'commande';
+									if (is_object($value)) $originidforcontact = $value->id;
+									else $originidforcontact = $value;
+									break; // We take first one
 								}
 							}
-
-							$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-							$sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
-
-							$resqlcontact = $this->db->query($sqlcontact);
-							if ($resqlcontact)
-							{
-								while ($objcontact = $this->db->fetch_object($resqlcontact))
-								{
-									//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-									$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
-								}
-							}
-							else dol_print_error($resqlcontact);
 						}
+
+						$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+						$sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+
+						$resqlcontact = $this->db->query($sqlcontact);
+						if ($resqlcontact)
+						{
+							while ($objcontact = $this->db->fetch_object($resqlcontact))
+							{
+								//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
+								$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
+							}
+						}
+						else dol_print_error($resqlcontact);
 					}
 
 					if (!$error)
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 1de1e64e0c7..9e34c745fab 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -80,7 +80,7 @@ $search_total_ttc = GETPOST('search_total_ttc', 'alpha');
 $search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
 $optioncss = GETPOST('optioncss', 'alpha');
 $billed = GETPOST('billed', 'int');
-$viewstatut = GETPOST('viewstatut');
+$viewstatut = GETPOST('viewstatut', 'int');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 459940dcc64..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') {
-        echo '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
+    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/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index bfbafc93bd5..eeb662c6168 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -698,10 +698,7 @@ if ($resql)
 		print '<td>&nbsp;</td>';
 		print '<td>'.$langs->trans("Type").'</td>';
 		print '<td>'.$langs->trans("Numero").'</td>';
-		//if (! $search_account > 0)
-		//{
-			print '<td class=right>'.$langs->trans("BankAccount").'</td>';
-		//}
+		print '<td class=right>'.$langs->trans("BankAccount").'</td>';
 		print '<td class=right>'.$langs->trans("Debit").'</td>';
 		print '<td class=right>'.$langs->trans("Credit").'</td>';
 		/*if (! empty($conf->accounting->enabled))
@@ -824,19 +821,21 @@ if ($resql)
 	$moreforfilter = '';
 
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('DateOperationShort').' : ';
-	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout == 'phone' ? ' centpercent' : '').' inline-block">'.$langs->trans('From').' ';
+	$moreforfilter .= $langs->trans('DateOperationShort').' :';
+	$moreforfilter .= ($conf->browser->layout == 'phone' ? '<br>' : ' ');
+	$moreforfilter .= '<div class="nowrap inline-block">'.$langs->trans('From').' ';
 	$moreforfilter .= $form->selectDate($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0).'</div>';
 	//$moreforfilter .= ' - ';
-	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout == 'phone' ? ' centpercent' : '').' inline-block">'.$langs->trans('to').' '.$form->selectDate($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0).'</div>';
+	$moreforfilter .= '<div class="nowrap inline-block">'.$langs->trans('to').' '.$form->selectDate($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0).'</div>';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateValueShort').' : ';
-	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout == 'phone' ? ' centpercent' : '').' inline-block">'.$langs->trans('From').' ';
+	$moreforfilter .= ($conf->browser->layout == 'phone' ? '<br>' : ' ');
+	$moreforfilter .= '<div class="nowrap inline-block">'.$langs->trans('From').' ';
 	$moreforfilter .= $form->selectDate($search_dv_start, 'search_start_dv', 0, 0, 1, "search_form", 1, 0).'</div>';
 	//$moreforfilter .= ' - ';
-	$moreforfilter .= '<div class="nowrap'.($conf->browser->layout == 'phone' ? ' centpercent' : '').' inline-block">'.$langs->trans('to').' '.$form->selectDate($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0).'</div>';
+	$moreforfilter .= '<div class="nowrap inline-block">'.$langs->trans('to').' '.$form->selectDate($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0).'</div>';
 	$moreforfilter .= '</div>';
 
 	if (!empty($conf->categorie->enabled))
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 3baf50fcc2c..7e14516e4cd 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -443,7 +443,7 @@ if ($action == 'create')
 	print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	print '</table>';
@@ -945,7 +945,7 @@ else
 		print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
-			print $object->showOptionals($extrafields, 'edit');
+			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
 		print '</table>';
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index c80a0cd0ab8..72226f18cd6 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -283,7 +283,7 @@ if ($action == 'create')
 	// Label
 	print '<tr><td>';
 	print $form->editfieldkey('Label', 'label', '', $object, 0, 'string', '', 1).'</td><td>';
-	print '<input name="label" id="label" class="minwidth300" value="'.($label ? $label : $langs->trans("VariousPayment")).'">';
+	print '<input name="label" id="label" class="minwidth300 maxwidth150onsmartphone" value="'.($label ? $label : $langs->trans("VariousPayment")).'">';
 	print '</td></tr>';
 
 	// Sens
@@ -296,7 +296,7 @@ if ($action == 'create')
 	// Amount
 	print '<tr><td>';
 	print $form->editfieldkey('Amount', 'amount', '', $object, 0, 'string', '', 1).'</td><td>';
-	print '<input name="amount" id="amount" class="minwidth100" value="'.$amount.'">';
+	print '<input name="amount" id="amount" class="minwidth100 maxwidth150onsmartphone" value="'.$amount.'">';
 	print '</td></tr>';
 
 	// Bank
@@ -321,7 +321,7 @@ if ($action == 'create')
 		print '<tr><td><label for="num_payment">'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '</label></td>';
-		print '<td><input name="num_payment" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
+		print '<td><input name="num_payment" class="maxwidth150onsmartphone" id="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 	}
 
     // Project
@@ -344,8 +344,6 @@ if ($action == 'create')
     $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
 
-    print '</td></tr>';
-
     // Category
     if (is_array($options) && count($options) && $conf->categorie->enabled)
     {
@@ -360,13 +358,13 @@ if ($action == 'create')
 		// TODO Remove the fieldrequired and allow instead to edit a various payment to enter accounting code
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("AccountAccounting").'</td>';
         print '<td>';
-		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, '');
+		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1);
         print '</td></tr>';
 	}
 	else // For external software
 	{
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountAccounting").'</td>';
-		print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code" value="'.$accountancy_code.'">';
+		print '<td><input class="minwidth100 maxwidthonsmartphone" name="accountancy_code" value="'.$accountancy_code.'">';
 		print '</td></tr>';
 	}
 
@@ -381,14 +379,14 @@ if ($action == 'create')
         }
         else
         {
-            print '<input type="text" class="maxwidth200" name="subledger_account" value="'.$subledger_account.'">';
+            print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
         }
         print '</td></tr>';
     }
     else // For external software
     {
         print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
-        print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="subledger_account" value="'.$subledger_account.'">';
+        print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
         print '</td></tr>';
     }
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 48cd8e81054..f0854eabde2 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -986,7 +986,7 @@ if (empty($reshook))
 					$object->entity = $originentity;
 				}
 				$object->socid = GETPOST('socid', 'int');
-				$object->number = $_POST['ref'];
+				$object->ref = $_POST['ref'];
 				$object->date = $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
 				$object->note_public		= trim(GETPOST('note_public', 'none'));
@@ -1166,7 +1166,7 @@ if (empty($reshook))
 			{
 				$object->socid = GETPOST('socid', 'int');
 				$object->type            = $_POST['type'];
-				$object->number          = $_POST['ref'];
+				$object->ref             = $_POST['ref'];
 				$object->date            = $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
 				$object->note_public = trim(GETPOST('note_public', 'none'));
@@ -1216,7 +1216,7 @@ if (empty($reshook))
 				// Si facture standard
 				$object->socid = GETPOST('socid', 'int');
 				$object->type				= GETPOST('type');
-				$object->number = $_POST['ref'];
+				$object->ref = $_POST['ref'];
 				$object->date				= $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
 				$object->note_public		= trim(GETPOST('note_public', 'none'));
@@ -3282,11 +3282,11 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="2"', 'cols'=>2);
+	$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="2"', 'cols' => '2');
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (empty($reshook)) {
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	// Template to use by default
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 0ce2930840f..7886b62f00e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -980,7 +980,7 @@ class Facture extends CommonInvoice
 		}
 		elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
 		{
-			$this->fetchObjectLinked('', '', $facture->id, 'facture');
+			$this->fetchObjectLinked('', '', $this->id, 'facture');
 
 			foreach ($this->linkedObjectsIds as $typeObject => $Tfk_object)
 			{
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index d2cad75ca77..d591c8b45f3 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -86,7 +86,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 	}
     print '</td>';
     print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
-    print '<td class="linkedcol-action right"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+    print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
     print "</tr>\n";
 }
 if (count($linkedObjectBlock) > 1)
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index cb16ce407f8..9fe3a6f4c83 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -57,7 +57,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 	}
 	?></td>
 	<td class="linkedcol-statut right"><?php echo $objectlink->getLibStatut(3); ?></td>
-	<td class="linkedcol-action right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	<td class="linkedcol-action right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
 	<?php
 }
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 1e2050c5a47..c693aa89b4c 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -42,12 +42,12 @@ class BonPrelevement extends CommonObject
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='widthdraw';
+	public $element = 'widthdraw';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='prelevement_bons';
+	public $table_element = 'prelevement_bons';
 
     /**
      * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -68,11 +68,11 @@ class BonPrelevement extends CommonObject
 
 	public $total;
 	public $fetched;
-	public $statut;    // 0-Wait, 1-Trans, 2-Done
-	public $labelStatus=array();
+	public $statut; // 0-Wait, 1-Trans, 2-Done
+	public $labelStatus = array();
 
-	public $invoice_in_error=array();
-	public $thirdparty_in_error=array();
+	public $invoice_in_error = array();
+	public $thirdparty_in_error = array();
 
 	const STATUS_DRAFT = 0;
 	const STATUS_TRANSFERED = 1;
@@ -87,12 +87,12 @@ class BonPrelevement extends CommonObject
 	 */
 	public function __construct($db, $filename = '')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$error = 0;
 		$this->db = $db;
 
-		$this->filename=$filename;
+		$this->filename = $filename;
 
 		$this->date_echeance = time();
 		$this->raison_sociale = "";
@@ -143,12 +143,12 @@ class BonPrelevement extends CommonObject
 			if ($line_id > 0)
 			{
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_facture (";
-				$sql.= "fk_facture";
-				$sql.= ",fk_prelevement_lignes";
-				$sql.= ") VALUES (";
-				$sql.= $facture_id;
-				$sql.= ", ".$line_id;
-				$sql.= ")";
+				$sql .= "fk_facture";
+				$sql .= ",fk_prelevement_lignes";
+				$sql .= ") VALUES (";
+				$sql .= $facture_id;
+				$sql .= ", ".$line_id;
+				$sql .= ")";
 
 				if ($this->db->query($sql))
 				{
@@ -199,14 +199,14 @@ class BonPrelevement extends CommonObject
              * We aggregate the lines
              */
 			$sql = "SELECT rowid";
-			$sql.= " FROM  ".MAIN_DB_PREFIX."prelevement_lignes";
-			$sql.= " WHERE fk_prelevement_bons = ".$this->id;
-			$sql.= " AND fk_soc =".$client_id;
-			$sql.= " AND code_banque ='".$code_banque."'";
-			$sql.= " AND code_guichet ='".$code_guichet."'";
-			$sql.= " AND number ='".$number."'";
+			$sql .= " FROM  ".MAIN_DB_PREFIX."prelevement_lignes";
+			$sql .= " WHERE fk_prelevement_bons = ".$this->id;
+			$sql .= " AND fk_soc =".$client_id;
+			$sql .= " AND code_banque ='".$code_banque."'";
+			$sql .= " AND code_guichet ='".$code_guichet."'";
+			$sql .= " AND number ='".$number."'";
 
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$num = $this->db->num_rows($resql);
@@ -222,24 +222,24 @@ class BonPrelevement extends CommonObject
              * No aggregate
              */
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_lignes (";
-			$sql.= "fk_prelevement_bons";
-			$sql.= ", fk_soc";
-			$sql.= ", client_nom";
-			$sql.= ", amount";
-			$sql.= ", code_banque";
-			$sql.= ", code_guichet";
-			$sql.= ", number";
-			$sql.= ", cle_rib";
-			$sql.= ") VALUES (";
-			$sql.= $this->id;
-			$sql.= ", ".$client_id;
-			$sql.= ", '".$this->db->escape($client_nom)."'";
-			$sql.= ", '".price2num($amount)."'";
-			$sql.= ", '".$code_banque."'";
-			$sql.= ", '".$code_guichet."'";
-			$sql.= ", '".$number."'";
-			$sql.= ", '".$number_key."'";
-			$sql.= ")";
+			$sql .= "fk_prelevement_bons";
+			$sql .= ", fk_soc";
+			$sql .= ", client_nom";
+			$sql .= ", amount";
+			$sql .= ", code_banque";
+			$sql .= ", code_guichet";
+			$sql .= ", number";
+			$sql .= ", cle_rib";
+			$sql .= ") VALUES (";
+			$sql .= $this->id;
+			$sql .= ", ".$client_id;
+			$sql .= ", '".$this->db->escape($client_nom)."'";
+			$sql .= ", '".price2num($amount)."'";
+			$sql .= ", '".$code_banque."'";
+			$sql .= ", '".$code_guichet."'";
+			$sql .= ", '".$number."'";
+			$sql .= ", '".$number_key."'";
+			$sql .= ")";
 
 			if ($this->db->query($sql))
 			{
@@ -285,19 +285,19 @@ class BonPrelevement extends CommonObject
 		global $conf;
 
 		$sql = "SELECT p.rowid, p.ref, p.amount, p.note";
-		$sql.= ", p.datec as dc";
-		$sql.= ", p.date_trans as date_trans";
-		$sql.= ", p.method_trans, p.fk_user_trans";
-		$sql.= ", p.date_credit as date_credit";
-		$sql.= ", p.fk_user_credit";
-		$sql.= ", p.statut";
-		$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-		$sql.= " WHERE p.entity IN (".getEntity('invoice').")";
-		if ($rowid > 0) $sql.= " AND p.rowid = ".$rowid;
-		else $sql.= " AND p.ref = '".$this->db->escape($ref)."'";
+		$sql .= ", p.datec as dc";
+		$sql .= ", p.date_trans as date_trans";
+		$sql .= ", p.method_trans, p.fk_user_trans";
+		$sql .= ", p.date_credit as date_credit";
+		$sql .= ", p.fk_user_credit";
+		$sql .= ", p.statut";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+		$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+		if ($rowid > 0) $sql .= " AND p.rowid = ".$rowid;
+		else $sql .= " AND p.ref = '".$this->db->escape($ref)."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$result=$this->db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -344,30 +344,30 @@ class BonPrelevement extends CommonObject
 	public function set_credite()
 	{
         // phpcs:enable
-		global $user,$conf;
+		global $user, $conf;
 
 		$error = 0;
 
 		if ($this->db->begin())
 		{
 			$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
-			$sql.= " SET statut = 1";
-			$sql.= " WHERE rowid = ".$this->id;
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " SET statut = 1";
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
 
-			$result=$this->db->query($sql);
-			if (! $result)
+			$result = $this->db->query($sql);
+			if (!$result)
 			{
 				dol_syslog(get_class($this)."::set_credite Erreur 1");
 				$error++;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$facs = array();
 				$facs = $this->getListInvoices();
 
-				$num=count($facs);
+				$num = count($facs);
 				for ($i = 0; $i < $num; $i++)
 				{
 					/* Tag invoice as payed */
@@ -378,13 +378,13 @@ class BonPrelevement extends CommonObject
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
 				$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
-				$sql.= " SET statut = 2";
-				$sql.= " WHERE fk_prelevement_bons = ".$this->id;
+				$sql .= " SET statut = 2";
+				$sql .= " WHERE fk_prelevement_bons = ".$this->id;
 
-				if (! $this->db->query($sql))
+				if (!$this->db->query($sql))
 				{
 					dol_syslog(get_class($this)."::set_credite Erreur 1");
 					$error++;
@@ -394,7 +394,7 @@ class BonPrelevement extends CommonObject
 			/*
              * End of procedure
              */
-			if (! $error)
+			if (!$error)
 			{
 				$this->db->commit();
 				return 0;
@@ -425,7 +425,7 @@ class BonPrelevement extends CommonObject
 	public function set_infocredit($user, $date)
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -436,12 +436,12 @@ class BonPrelevement extends CommonObject
 				if ($this->db->begin())
 				{
 					$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
-					$sql.= " SET fk_user_credit = ".$user->id;
-					$sql.= ", statut = 2";
-					$sql.= ", date_credit = '".$this->db->idate($date)."'";
-					$sql.= " WHERE rowid=".$this->id;
-					$sql.= " AND entity = ".$conf->entity;
-					$sql.= " AND statut = 1";
+					$sql .= " SET fk_user_credit = ".$user->id;
+					$sql .= ", statut = 2";
+					$sql .= ", date_credit = '".$this->db->idate($date)."'";
+					$sql .= " WHERE rowid=".$this->id;
+					$sql .= " AND entity = ".$conf->entity;
+					$sql .= " AND statut = 1";
 
 					if ($this->db->query($sql))
 					{
@@ -458,7 +458,7 @@ class BonPrelevement extends CommonObject
 						$facs = $this->getListInvoices(1);
 
 						// Loop on each invoice. $facs=array(0=>id, 1=>amount requested)
-						$num=count($facs);
+						$num = count($facs);
 						for ($i = 0; $i < $num; $i++)
 						{
 							$fac = new Facture($this->db);
@@ -466,7 +466,7 @@ class BonPrelevement extends CommonObject
 							$amounts[$fac->id] = $facs[$i][1];
 							$amountsperthirdparty[$fac->socid][$fac->id] = $facs[$i][1];
 
-							$totalpaye  = $fac->getSommePaiement();
+							$totalpaye = $fac->getSommePaiement();
 							$totalcreditnotes = $fac->getSumCreditNotesUsed();
 							$totaldeposits = $fac->getSumDepositsUsed();
 							$alreadypayed = $totalpaye + $totalcreditnotes + $totaldeposits;
@@ -481,9 +481,9 @@ class BonPrelevement extends CommonObject
 						{
 							$paiement = new Paiement($this->db);
 							$paiement->datepaye     = $date;
-							$paiement->amounts      = $cursoramounts;		// Array with detail of dispatching of payments for each invoice
-							$paiement->paiementid   = 3; 					//
-							$paiement->num_paiement = $this->ref;			// Set ref of direct debit note
+							$paiement->amounts      = $cursoramounts; // Array with detail of dispatching of payments for each invoice
+							$paiement->paiementid   = 3; //
+							$paiement->num_paiement = $this->ref; // Set ref of direct debit note
 							$paiement->id_prelevement = $this->id;
 
 							$paiement_id = $paiement->create($user);
@@ -494,7 +494,7 @@ class BonPrelevement extends CommonObject
 							}
 							else
 							{
-								$result=$paiement->addPaymentToBank($user, 'payment', '(WithdrawalPayment)', $bankaccount, '', '');
+								$result = $paiement->addPaymentToBank($user, 'payment', '(WithdrawalPayment)', $bankaccount, '', '');
 								if ($result < 0)
 								{
 									dol_syslog(get_class($this)."::set_infocredit AddPaymentToBank Error");
@@ -509,10 +509,10 @@ class BonPrelevement extends CommonObject
 						// Update withdrawal line
 						// TODO: Translate to ligneprelevement.class.php
 						$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
-						$sql.= " SET statut = 2";
-						$sql.= " WHERE fk_prelevement_bons = ".$this->id;
+						$sql .= " SET statut = 2";
+						$sql .= " WHERE fk_prelevement_bons = ".$this->id;
 
-						if (! $this->db->query($sql))
+						if (!$this->db->query($sql))
 						{
 							dol_syslog(get_class($this)."::set_infocredit Update lines Error");
 							$error++;
@@ -572,7 +572,7 @@ class BonPrelevement extends CommonObject
 	public function set_infotrans($user, $date, $method)
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -580,13 +580,13 @@ class BonPrelevement extends CommonObject
 		if ($this->db->begin())
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
-			$sql.= " SET fk_user_trans = ".$user->id;
-			$sql.= " , date_trans = '".$this->db->idate($date)."'";
-			$sql.= " , method_trans = ".$method;
-			$sql.= " , statut = 1";
-			$sql.= " WHERE rowid = ".$this->id;
-			$sql.= " AND entity = ".$conf->entity;
-			$sql.= " AND statut = 0";
+			$sql .= " SET fk_user_trans = ".$user->id;
+			$sql .= " , date_trans = '".$this->db->idate($date)."'";
+			$sql .= " , method_trans = ".$method;
+			$sql .= " , statut = 1";
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
+			$sql .= " AND statut = 0";
 
 			if ($this->db->query($sql))
 			{
@@ -594,7 +594,7 @@ class BonPrelevement extends CommonObject
 				$langs->load('withdrawals');
 				$subject = $langs->trans("InfoTransSubject", $this->ref);
 				$message = $langs->trans("InfoTransMessage", $this->ref, dolGetFirstLastname($user->firstname, $user->lastname));
-				$message .=$langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date, 'day'));
+				$message .= $langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date, 'day'));
 
 				// TODO Call trigger to create a notification using notification module
 			}
@@ -644,16 +644,16 @@ class BonPrelevement extends CommonObject
          */
 		$sql = "SELECT fk_facture";
 		if ($amounts) $sql .= ", SUM(pl.amount)";
-		$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-		$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-		$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
-		$sql.= " WHERE pf.fk_prelevement_lignes = pl.rowid";
-		$sql.= " AND pl.fk_prelevement_bons = p.rowid";
-		$sql.= " AND p.rowid = ".$this->id;
-		$sql.= " AND p.entity = ".$conf->entity;
-		if ($amounts) $sql.= " GROUP BY fk_facture";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
+		$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
+		$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
+		$sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid";
+		$sql .= " AND pl.fk_prelevement_bons = p.rowid";
+		$sql .= " AND p.rowid = ".$this->id;
+		$sql .= " AND p.entity = ".$conf->entity;
+		if ($amounts) $sql .= " GROUP BY fk_facture";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
@@ -697,18 +697,18 @@ class BonPrelevement extends CommonObject
 		global $conf;
 
 		$sql = "SELECT sum(pfd.amount) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
-		$sql.= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f,";
+		$sql .= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 		//$sql.= " ,".MAIN_DB_PREFIX."c_paiement as cp";
-		$sql.= " WHERE f.fk_statut = 1";
-		$sql.= " AND f.entity IN (".getEntity('invoice').")";
-		$sql.= " AND f.rowid = pfd.fk_facture";
-		$sql.= " AND f.paye = 0";
-		$sql.= " AND pfd.traite = 0";
-		$sql.= " AND f.total_ttc > 0";
+		$sql .= " WHERE f.fk_statut = 1";
+		$sql .= " AND f.entity IN (".getEntity('invoice').")";
+		$sql .= " AND f.rowid = pfd.fk_facture";
+		$sql .= " AND f.paye = 0";
+		$sql .= " AND pfd.traite = 0";
+		$sql .= " AND f.total_ttc > 0";
 
 		$resql = $this->db->query($sql);
-		if ( $resql )
+		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
 
@@ -739,21 +739,21 @@ class BonPrelevement extends CommonObject
 		global $conf;
 
 		$sql = "SELECT count(f.rowid) as nb";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-		$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-		$sql.= " WHERE f.entity IN (".getEntity('invoice').")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+		$sql .= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+		$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 		if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
 		{
-			$sql.= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+			$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 		}
-		$sql.= " AND f.rowid = pfd.fk_facture";
-		$sql.= " AND pfd.traite = 0";
-		$sql.= " AND f.total_ttc > 0";
+		$sql .= " AND f.rowid = pfd.fk_facture";
+		$sql .= " AND pfd.traite = 0";
+		$sql .= " AND f.total_ttc > 0";
 
 		dol_syslog(get_class($this)."::NbFactureAPrelever");
 		$resql = $this->db->query($sql);
 
-		if ( $resql )
+		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
 
@@ -763,7 +763,7 @@ class BonPrelevement extends CommonObject
 		}
 		else
 		{
-			$this->error=get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
+			$this->error = get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
 			return -1;
 		}
 	}
@@ -798,7 +798,7 @@ class BonPrelevement extends CommonObject
 
 		$datetimeprev = time();
         //Choice the date of the execution direct debit
-        if(!empty($executiondate)) $datetimeprev = $executiondate;
+        if (!empty($executiondate)) $datetimeprev = $executiondate;
 
 		$month = strftime("%m", $datetimeprev);
 		$year = strftime("%Y", $datetimeprev);
@@ -810,26 +810,26 @@ class BonPrelevement extends CommonObject
 		$factures = array();
 		$factures_prev = array();
 		$factures_result = array();
-		$factures_prev_id=array();
-		$factures_errors=array();
+		$factures_prev_id = array();
+		$factures_errors = array();
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "SELECT f.rowid, pfd.rowid as pfdrowid, f.fk_soc";
-			$sql.= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib";
-			$sql.= ", pfd.amount";
-			$sql.= ", s.nom as name";
-			$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-			$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-			$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-			$sql.= " WHERE f.rowid = pfd.fk_facture";
-			$sql.= " AND f.entity IN (".getEntity('invoice').')';
-			$sql.= " AND s.rowid = f.fk_soc";
+			$sql .= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib";
+			$sql .= ", pfd.amount";
+			$sql .= ", s.nom as name";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+			$sql .= " WHERE f.rowid = pfd.fk_facture";
+			$sql .= " AND f.entity IN (".getEntity('invoice').')';
+			$sql .= " AND s.rowid = f.fk_soc";
 			//if ($banque || $agence) $sql.= " AND s.rowid = sr.fk_soc";
-			$sql.= " AND f.fk_statut = 1";
-			$sql.= " AND f.paye = 0";
-			$sql.= " AND pfd.traite = 0";
-			$sql.= " AND f.total_ttc > 0";
+			$sql .= " AND f.fk_statut = 1";
+			$sql .= " AND f.paye = 0";
+			$sql .= " AND pfd.traite = 0";
+			$sql .= " AND f.total_ttc > 0";
 			//if ($banque) $sql.= " AND sr.code_banque = '".$conf->global->PRELEVEMENT_CODE_BANQUE."'";
 			//if ($agence) $sql.= " AND sr.code_guichet = '".$conf->global->PRELEVEMENT_CODE_GUICHET."'";
 
@@ -844,7 +844,7 @@ class BonPrelevement extends CommonObject
 				while ($i < $num)
 				{
 					$row = $this->db->fetch_row($resql);
-					$factures[$i] = $row;	// All fields
+					$factures[$i] = $row; // All fields
 					$i++;
 				}
 				$this->db->free($resql);
@@ -857,9 +857,9 @@ class BonPrelevement extends CommonObject
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$soc = new Societe($this->db);
 
 			// Check RIB
@@ -899,8 +899,8 @@ class BonPrelevement extends CommonObject
 							else
 							{
 								dol_syslog(__METHOD__."::Check RIB Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_WARNING);
-								$this->invoice_in_error[$fac[0]]="Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
-								$this->thirdparty_in_error[$soc->id]="Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
+								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
+								$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice ".$fact->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 							}
 						}
 						else
@@ -920,10 +920,10 @@ class BonPrelevement extends CommonObject
 			}
 		}
 
-		$ok=0;
+		$ok = 0;
 
 		// Withdraw invoices in factures_prev array
-		$out=count($factures_prev)." invoices will be withdrawn.";
+		$out = count($factures_prev)." invoices will be withdrawn.";
 		//print $out."\n";
 		dol_syslog($out);
 
@@ -938,9 +938,9 @@ class BonPrelevement extends CommonObject
 
 		if (count($factures_prev) > 0)
 		{
-			if ($mode=='real')
+			if ($mode == 'real')
 			{
-				$ok=1;
+				$ok = 1;
 			}
 			else
 			{
@@ -957,7 +957,7 @@ class BonPrelevement extends CommonObject
              */
 			$this->db->begin();
 
-			$now=dol_now();
+			$now = dol_now();
 
 			/*
              * Traitements
@@ -967,10 +967,10 @@ class BonPrelevement extends CommonObject
 				$ref = substr($year, -2).$month;
 
 				$sql = "SELECT substring(ref from char_length(ref) - 1)";
-				$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
-				$sql.= " WHERE ref LIKE '%".$this->db->escape($ref)."%'";
-				$sql.= " AND entity = ".$conf->entity;
-				$sql.= " ORDER BY ref DESC LIMIT 1";
+				$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
+				$sql .= " WHERE ref LIKE '%".$this->db->escape($ref)."%'";
+				$sql .= " AND entity = ".$conf->entity;
+				$sql .= " ORDER BY ref DESC LIMIT 1";
 
 				dol_syslog(get_class($this)."::Create sql=".$sql, LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -978,21 +978,21 @@ class BonPrelevement extends CommonObject
 				if ($resql)
 				{
 					$row = $this->db->fetch_row($resql);
-					$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1, 0, 2), 2, "0", STR_PAD_LEFT);
+					$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0]) + 1, 0, 2), 2, "0", STR_PAD_LEFT);
 
-					$dir=$conf->prelevement->dir_output.'/receipts';
-					if (! is_dir($dir)) dol_mkdir($dir);
+					$dir = $conf->prelevement->dir_output.'/receipts';
+					if (!is_dir($dir)) dol_mkdir($dir);
 
 					$this->filename = $dir.'/'.$ref.'.xml';
 
 					// Create withdraw receipt in database
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
-					$sql.= " ref, entity, datec";
-					$sql.= ") VALUES (";
-					$sql.= "'".$this->db->escape($ref)."'";
-					$sql.= ", ".$conf->entity;
-					$sql.= ", '".$this->db->idate($now)."'";
-					$sql.= ")";
+					$sql .= " ref, entity, datec";
+					$sql .= ") VALUES (";
+					$sql .= "'".$this->db->escape($ref)."'";
+					$sql .= ", ".$conf->entity;
+					$sql .= ", '".$this->db->idate($now)."'";
+					$sql .= ")";
 
 					$resql = $this->db->query($sql);
 					if ($resql)
@@ -1046,15 +1046,15 @@ class BonPrelevement extends CommonObject
 
 						// Update invoice requests as done
 						$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande";
-						$sql.= " SET traite = 1";
-						$sql.= ", date_traite = '".$this->db->idate($now)."'";
-						$sql.= ", fk_prelevement_bons = ".$this->id;
-						$sql.= " WHERE rowid = ".$fac[1];
+						$sql .= " SET traite = 1";
+						$sql .= ", date_traite = '".$this->db->idate($now)."'";
+						$sql .= ", fk_prelevement_bons = ".$this->id;
+						$sql .= " WHERE rowid = ".$fac[1];
 
 						dol_syslog(__METHOD__."::Update Orders::Sql=".$sql, LOG_DEBUG);
-						$resql=$this->db->query($sql);
+						$resql = $this->db->query($sql);
 
-						if (! $resql)
+						if (!$resql)
 						{
 							$error++;
 							dol_syslog(__METHOD__."::Update Orders::Error=".$this->db->error(), LOG_ERR);
@@ -1077,18 +1077,18 @@ class BonPrelevement extends CommonObject
 					$this->date_echeance = $datetimeprev;
 					$this->reference_remise = $ref;
 
-					$id=$conf->global->PRELEVEMENT_ID_BANKACCOUNT;
+					$id = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
 					$account = new Account($this->db);
-					if ($account->fetch($id)>0)
+					if ($account->fetch($id) > 0)
 					{
-						$this->emetteur_code_banque 	   = $account->code_banque;
+						$this->emetteur_code_banque = $account->code_banque;
 						$this->emetteur_code_guichet       = $account->code_guichet;
 						$this->emetteur_numero_compte      = $account->number;
-						$this->emetteur_number_key		   = $account->cle_rib;
+						$this->emetteur_number_key = $account->cle_rib;
 						$this->emetteur_iban               = $account->iban;
 						$this->emetteur_bic                = $account->bic;
 
-						$this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS;		// Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+						$this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
 						$this->raison_sociale              = $account->proprio;
 					}
@@ -1107,21 +1107,21 @@ class BonPrelevement extends CommonObject
              * Update total
              */
 			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
-			$sql.= " SET amount = ".price2num($this->total);
-			$sql.= " WHERE rowid = ".$this->id;
-			$sql.= " AND entity = ".$conf->entity;
+			$sql .= " SET amount = ".price2num($this->total);
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND entity = ".$conf->entity;
 
-			$resql=$this->db->query($sql);
-			if (! $resql)
+			$resql = $this->db->query($sql);
+			if (!$resql)
 			{
 				$error++;
 				dol_syslog(__METHOD__."::Error update total: ".$this->db->error(), LOG_ERR);
 			}
 
-            if (! $error && ! $notrigger)
+            if (!$error && !$notrigger)
             {
                 // Call trigger
-                $result=$this->call_trigger('DIRECT_DEBIT_ORDER_CREATE', $user);
+                $result = $this->call_trigger('DIRECT_DEBIT_ORDER_CREATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
             }
@@ -1158,43 +1158,43 @@ class BonPrelevement extends CommonObject
 		$error = 0;
 		$resql1 = $resql2 = $resql3 = $resql4 = 0;
 
-		if (! $notrigger)
+		if (!$notrigger)
 		{
 		    // Call trigger
-		    $result=$this->call_trigger('DIRECT_DEBIT_ORDER_DELETE', $user);
+		    $result = $this->call_trigger('DIRECT_DEBIT_ORDER_DELETE', $user);
 		    if ($result < 0) $error++;
 		    // End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
-			$resql1=$this->db->query($sql);
-			if (! $resql1) dol_print_error($this->db);
+			$resql1 = $this->db->query($sql);
+			if (!$resql1) dol_print_error($this->db);
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id;
-			$resql2=$this->db->query($sql);
-			if (! $resql2) dol_print_error($this->db);
+			$resql2 = $this->db->query($sql);
+			if (!$resql2) dol_print_error($this->db);
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".$this->id;
-			$resql3=$this->db->query($sql);
-			if (! $resql3) dol_print_error($this->db);
+			$resql3 = $this->db->query($sql);
+			if (!$resql3) dol_print_error($this->db);
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".$this->id;
-			$resql4=$this->db->query($sql);
-			if (! $resql4) dol_print_error($this->db);
+			$resql4 = $this->db->query($sql);
+			if (!$resql4) dol_print_error($this->db);
 		}
 
-		if ($resql1 && $resql2 && $resql3 && $resql4 && ! $error)
+		if ($resql1 && $resql2 && $resql3 && $resql4 && !$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -1221,34 +1221,34 @@ class BonPrelevement extends CommonObject
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-		$result='';
+		$result = '';
 
-		$label = '<u>' . $langs->trans("ShowWithdraw") . '</u>';
-		$label.= '<br>';
-		$label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		$label = '<u>'.$langs->trans("ShowWithdraw").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		$url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
 
 		if ($option != 'nolink')
 		{
 			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		}
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label=$langs->trans("ShowMyObject");
-				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
-			$linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
 			 $hookmanager->initHooks(array('myobjectdao'));
@@ -1257,22 +1257,22 @@ class BonPrelevement extends CommonObject
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
 		}
-		else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart.=$linkclose.'>';
-		$linkend='</a>';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
-		if ($withpicto != 2) $result.= $this->ref;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-		global $action,$hookmanager;
+		global $action, $hookmanager;
 		$hookmanager->initHooks(array('myobjectdao'));
-		$parameters=array('id'=>$this->id, 'getnomurl'=>$result);
-		$reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) $result = $hookmanager->resPrint;
 		else $result .= $hookmanager->resPrint;
 
@@ -1293,7 +1293,7 @@ class BonPrelevement extends CommonObject
 		$result = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-		$sql.= " WHERE rowid = '".$rowid."'";
+		$sql .= " WHERE rowid = '".$rowid."'";
 
 		if ($this->db->query($sql))
 		{
@@ -1347,7 +1347,7 @@ class BonPrelevement extends CommonObject
 
 		if ($this->DeleteNotification($user, $action) == 0)
 		{
-			$now=dol_now();
+			$now = dol_now();
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)";
 			$sql .= " VALUES (".$db->idate($now).",".$user.", 'NULL', 'NULL', '".$action."')";
@@ -1381,7 +1381,7 @@ class BonPrelevement extends CommonObject
 	 */
 	public function generate($format = 'ALL', $executiondate = '')
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		//TODO: Optimize code to read lines in a single function
 
@@ -1392,11 +1392,11 @@ class BonPrelevement extends CommonObject
 		$this->file = fopen($this->filename, "w");
 		if (empty($this->file))
 		{
-			$this->error=$langs->trans('ErrorFailedToOpenFile', $this->filename);
+			$this->error = $langs->trans('ErrorFailedToOpenFile', $this->filename);
 			return -1;
 		}
 
-		$found=0;
+		$found = 0;
 
 		// Build file for European countries
 		if ($mysoc->isInEEC())
@@ -1414,9 +1414,9 @@ class BonPrelevement extends CommonObject
 			$dateTime_ECMA = dol_print_date($now, '%Y-%m-%dT%H:%M:%S');
 
 			$date_actu = $now;
-                        if (!empty($executiondate)) $date_actu=$executiondate;
+                        if (!empty($executiondate)) $date_actu = $executiondate;
 
-			$dateTime_YMD  = dol_print_date($date_actu, '%Y%m%d');
+			$dateTime_YMD = dol_print_date($date_actu, '%Y%m%d');
 			$dateTime_YMDHMS = dol_print_date($date_actu, '%Y%m%d%H%M%S');
 			$fileDebiteurSection = '';
 			$fileEmetteurSection = '';
@@ -1428,27 +1428,27 @@ class BonPrelevement extends CommonObject
 			 */
 
 			$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
-			$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
-			$sql.= " f.ref as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
-			$sql.= " FROM";
-			$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
-			$sql.= " ".MAIN_DB_PREFIX."facture as f,";
-			$sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf,";
-			$sql.= " ".MAIN_DB_PREFIX."societe as soc,";
-			$sql.= " ".MAIN_DB_PREFIX."c_country as c,";
-			$sql.= " ".MAIN_DB_PREFIX."societe_rib as rib";
-			$sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
-			$sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
-			$sql.= " AND pf.fk_facture = f.rowid";
-			$sql.= " AND soc.fk_pays = c.rowid";
-			$sql.= " AND soc.rowid = f.fk_soc";
-			$sql.= " AND rib.fk_soc = f.fk_soc";
-			$sql.= " AND rib.default_rib = 1";
-			$sql.= " AND rib.type = 'ban'";
+			$sql .= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
+			$sql .= " f.ref as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, rib.rum, rib.date_rum";
+			$sql .= " FROM";
+			$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+			$sql .= " ".MAIN_DB_PREFIX."facture as f,";
+			$sql .= " ".MAIN_DB_PREFIX."prelevement_facture as pf,";
+			$sql .= " ".MAIN_DB_PREFIX."societe as soc,";
+			$sql .= " ".MAIN_DB_PREFIX."c_country as c,";
+			$sql .= " ".MAIN_DB_PREFIX."societe_rib as rib";
+			$sql .= " WHERE pl.fk_prelevement_bons = ".$this->id;
+			$sql .= " AND pl.rowid = pf.fk_prelevement_lignes";
+			$sql .= " AND pf.fk_facture = f.rowid";
+			$sql .= " AND soc.fk_pays = c.rowid";
+			$sql .= " AND soc.rowid = f.fk_soc";
+			$sql .= " AND rib.fk_soc = f.fk_soc";
+			$sql .= " AND rib.default_rib = 1";
+			$sql .= " AND rib.type = 'ban'";
 			//print $sql;
 
 			// Define $fileDebiteurSection. One section DrctDbtTxInf per invoice.
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$num = $this->db->num_rows($resql);
@@ -1464,7 +1464,7 @@ class BonPrelevement extends CommonObject
 			}
 			else
 			{
-				fputs($this->file, 'ERROR DEBITOR '.$sql.$CrLf);		// DEBITOR = Customers
+				fputs($this->file, 'ERROR DEBITOR '.$sql.$CrLf); // DEBITOR = Customers
 				$result = -2;
 			}
 
@@ -1475,7 +1475,7 @@ class BonPrelevement extends CommonObject
 			}
 			else
 			{
-				fputs($this->file, 'ERROR CREDITOR'.$CrLf);		// CREDITOR = My company
+				fputs($this->file, 'ERROR CREDITOR'.$CrLf); // CREDITOR = My company
 			}
 
 			/**
@@ -1504,10 +1504,10 @@ class BonPrelevement extends CommonObject
 			fputs($this->file, '		</GrpHdr>'.$CrLf);
 			// SEPA File Emetteur
 			if ($result != -2)
-			{	fputs($this-> file, $fileEmetteurSection);}
+			{	fputs($this-> file, $fileEmetteurSection); }
 			// SEPA File Debiteurs
 			if ($result != -2)
-			{	fputs($this-> file, $fileDebiteurSection);}
+			{	fputs($this-> file, $fileDebiteurSection); }
 			// SEPA FILE FOOTER
 			fputs($this->file, '		</PmtInf>'.$CrLf);
 			fputs($this->file, '	</CstmrDrctDbtInitn>'.$CrLf);
@@ -1515,21 +1515,21 @@ class BonPrelevement extends CommonObject
 		}
 
 		// Build file for Other Countries with unknow format
-		if (! $found)
+		if (!$found)
 		{
 			$this->total = 0;
 			$sql = "SELECT pl.amount";
-			$sql.= " FROM";
-			$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
-			$sql.= " ".MAIN_DB_PREFIX."facture as f,";
-			$sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
-			$sql.= " WHERE pl.fk_prelevement_bons = ".$this->id;
-			$sql.= " AND pl.rowid = pf.fk_prelevement_lignes";
-			$sql.= " AND pf.fk_facture = f.rowid";
+			$sql .= " FROM";
+			$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+			$sql .= " ".MAIN_DB_PREFIX."facture as f,";
+			$sql .= " ".MAIN_DB_PREFIX."prelevement_facture as pf";
+			$sql .= " WHERE pl.fk_prelevement_bons = ".$this->id;
+			$sql .= " AND pl.rowid = pf.fk_prelevement_lignes";
+			$sql .= " AND pf.fk_facture = f.rowid";
 
 			//Lines
 			$i = 0;
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$num = $this->db->num_rows($resql);
@@ -1553,7 +1553,7 @@ class BonPrelevement extends CommonObject
 		}
 
 		fclose($this->file);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 		@chmod($this->file, octdec($conf->global->MAIN_UMASK));
 		return $result;
 	}
@@ -1643,7 +1643,7 @@ class BonPrelevement extends CommonObject
 	public static function buildRumNumber($row_code_client, $row_datec, $row_drum)
 	{
 		global $langs;
-		$pre = substr(dol_string_nospecial(dol_string_unaccent($langs->transnoentitiesnoconv('RUM'))), 0, 3);	// Must always be on 3 char ('RUM' or 'UMR'. This is a protection against bad translation)
+		$pre = substr(dol_string_nospecial(dol_string_unaccent($langs->transnoentitiesnoconv('RUM'))), 0, 3); // Must always be on 3 char ('RUM' or 'UMR'. This is a protection against bad translation)
 		return $pre.'-'.$row_code_client.'-'.$row_drum.'-'.date('U', $row_datec);
 	}
 
@@ -1687,46 +1687,46 @@ class BonPrelevement extends CommonObject
 		// Define date of RUM signature
 		$DtOfSgntr = dol_print_date($row_datec, '%Y-%m-%d');
 
-		$XML_DEBITOR ='';
-		$XML_DEBITOR .='			<DrctDbtTxInf>'.$CrLf;
-		$XML_DEBITOR .='				<PmtId>'.$CrLf;
+		$XML_DEBITOR = '';
+		$XML_DEBITOR .= '			<DrctDbtTxInf>'.$CrLf;
+		$XML_DEBITOR .= '				<PmtId>'.$CrLf;
 	    // $XML_DEBITOR .='					<EndToEndId>'.('AS-'.dol_trunc($row_ref,20).'-'.$Rowing).'</EndToEndId>'.$CrLf;          // ISO20022 states that EndToEndId has a MaxLength of 35 characters
-		$XML_DEBITOR .='					<EndToEndId>'.(($conf->global->PRELEVEMENT_END_TO_END != "" ) ? $conf->global->PRELEVEMENT_END_TO_END : ('AS-'.dol_trunc($row_ref, 20)).'-'.$Rowing).'</EndToEndId>'.$CrLf;          // ISO20022 states that EndToEndId has a MaxLength of 35 characters
-		$XML_DEBITOR .='				</PmtId>'.$CrLf;
-		$XML_DEBITOR .='				<InstdAmt Ccy="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
-		$XML_DEBITOR .='				<DrctDbtTx>'.$CrLf;
-		$XML_DEBITOR .='					<MndtRltdInf>'.$CrLf;
-		$XML_DEBITOR .='						<MndtId>'.$Rum.'</MndtId>'.$CrLf;
-		$XML_DEBITOR .='						<DtOfSgntr>'.$DtOfSgntr.'</DtOfSgntr>'.$CrLf;
-		$XML_DEBITOR .='						<AmdmntInd>false</AmdmntInd>'.$CrLf;
-		$XML_DEBITOR .='					</MndtRltdInf>'.$CrLf;
-		$XML_DEBITOR .='				</DrctDbtTx>'.$CrLf;
-		$XML_DEBITOR .='				<DbtrAgt>'.$CrLf;
-		$XML_DEBITOR .='					<FinInstnId>'.$CrLf;
-		$XML_DEBITOR .='						<BIC>'.$row_bic.'</BIC>'.$CrLf;
-		$XML_DEBITOR .='					</FinInstnId>'.$CrLf;
-		$XML_DEBITOR .='				</DbtrAgt>'.$CrLf;
-		$XML_DEBITOR .='				<Dbtr>'.$CrLf;
-		$XML_DEBITOR .='					<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
-		$XML_DEBITOR .='					<PstlAdr>'.$CrLf;
-		$XML_DEBITOR .='						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
+		$XML_DEBITOR .= '					<EndToEndId>'.(($conf->global->PRELEVEMENT_END_TO_END != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('AS-'.dol_trunc($row_ref, 20)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
+		$XML_DEBITOR .= '				</PmtId>'.$CrLf;
+		$XML_DEBITOR .= '				<InstdAmt Ccy="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
+		$XML_DEBITOR .= '				<DrctDbtTx>'.$CrLf;
+		$XML_DEBITOR .= '					<MndtRltdInf>'.$CrLf;
+		$XML_DEBITOR .= '						<MndtId>'.$Rum.'</MndtId>'.$CrLf;
+		$XML_DEBITOR .= '						<DtOfSgntr>'.$DtOfSgntr.'</DtOfSgntr>'.$CrLf;
+		$XML_DEBITOR .= '						<AmdmntInd>false</AmdmntInd>'.$CrLf;
+		$XML_DEBITOR .= '					</MndtRltdInf>'.$CrLf;
+		$XML_DEBITOR .= '				</DrctDbtTx>'.$CrLf;
+		$XML_DEBITOR .= '				<DbtrAgt>'.$CrLf;
+		$XML_DEBITOR .= '					<FinInstnId>'.$CrLf;
+		$XML_DEBITOR .= '						<BIC>'.$row_bic.'</BIC>'.$CrLf;
+		$XML_DEBITOR .= '					</FinInstnId>'.$CrLf;
+		$XML_DEBITOR .= '				</DbtrAgt>'.$CrLf;
+		$XML_DEBITOR .= '				<Dbtr>'.$CrLf;
+		$XML_DEBITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
+		$XML_DEBITOR .= '					<PstlAdr>'.$CrLf;
+		$XML_DEBITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 		$addressline1 = dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")));
-		$addressline2 = dol_string_unaccent(strtr($row_zip.(($row_zip && $row_town)?' ':''.$row_town), array(CHR(13) => ", ", CHR(10) => "")));
-		if (trim($addressline1)) 	$XML_DEBITOR .='						<AdrLine>'.dolEscapeXML(dol_trunc($addressline1, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
-		if (trim($addressline2))	$XML_DEBITOR .='						<AdrLine>'.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
-		$XML_DEBITOR .='					</PstlAdr>'.$CrLf;
-		$XML_DEBITOR .='				</Dbtr>'.$CrLf;
-		$XML_DEBITOR .='				<DbtrAcct>'.$CrLf;
-		$XML_DEBITOR .='					<Id>'.$CrLf;
-		$XML_DEBITOR .='						<IBAN>'.preg_replace('/\s/', '', $row_iban).'</IBAN>'.$CrLf;
-		$XML_DEBITOR .='					</Id>'.$CrLf;
-		$XML_DEBITOR .='				</DbtrAcct>'.$CrLf;
-		$XML_DEBITOR .='				<RmtInf>'.$CrLf;
+		$addressline2 = dol_string_unaccent(strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => "")));
+		if (trim($addressline1)) 	$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline1, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
+		if (trim($addressline2))	$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
+		$XML_DEBITOR .= '					</PstlAdr>'.$CrLf;
+		$XML_DEBITOR .= '				</Dbtr>'.$CrLf;
+		$XML_DEBITOR .= '				<DbtrAcct>'.$CrLf;
+		$XML_DEBITOR .= '					<Id>'.$CrLf;
+		$XML_DEBITOR .= '						<IBAN>'.preg_replace('/\s/', '', $row_iban).'</IBAN>'.$CrLf;
+		$XML_DEBITOR .= '					</Id>'.$CrLf;
+		$XML_DEBITOR .= '				</DbtrAcct>'.$CrLf;
+		$XML_DEBITOR .= '				<RmtInf>'.$CrLf;
 	    // $XML_DEBITOR .='					<Ustrd>'.($row_ref.'/'.$Rowing.'/'.$Rum).'</Ustrd>'.$CrLf;
 	    // $XML_DEBITOR .='					<Ustrd>'.dol_trunc($row_ref, 135).'</Ustrd>'.$CrLf;        // 140 max
-		$XML_DEBITOR .='					<Ustrd>'.(($conf->global->PRELEVEMENT_USTRD != "" ) ? $conf->global->PRELEVEMENT_USTRD : dol_trunc($row_ref, 135) ).'</Ustrd>'.$CrLf;        // 140 max
-		$XML_DEBITOR .='				</RmtInf>'.$CrLf;
-		$XML_DEBITOR .='			</DrctDbtTxInf>'.$CrLf;
+		$XML_DEBITOR .= '					<Ustrd>'.(($conf->global->PRELEVEMENT_USTRD != "") ? $conf->global->PRELEVEMENT_USTRD : dol_trunc($row_ref, 135)).'</Ustrd>'.$CrLf; // 140 max
+		$XML_DEBITOR .= '				</RmtInf>'.$CrLf;
+		$XML_DEBITOR .= '			</DrctDbtTxInf>'.$CrLf;
 		return $XML_DEBITOR;
 	}
 
@@ -1755,11 +1755,11 @@ class BonPrelevement extends CommonObject
 
 		// Raison Sociale C2
 
-		fputs($this->file, substr($this->raison_sociale. "                           ", 0, 24));
+		fputs($this->file, substr($this->raison_sociale."                           ", 0, 24));
 
 		// Reference de la remise creancier D1 sur 7 caracteres
 
-		fputs($this->file, substr($this->reference_remise. "                           ", 0, 7));
+		fputs($this->file, substr($this->reference_remise."                           ", 0, 7));
 
 		// Zone Reservee D1-2
 
@@ -1822,29 +1822,29 @@ class BonPrelevement extends CommonObject
 		$dateTime_YMDHMS = dol_print_date($ladate, '%Y-%m-%dT%H:%M:%S');
 
 		// Get data of bank account
-		$id=$configuration->global->PRELEVEMENT_ID_BANKACCOUNT;
+		$id = $configuration->global->PRELEVEMENT_ID_BANKACCOUNT;
 		$account = new Account($this->db);
-		if ($account->fetch($id)>0)
+		if ($account->fetch($id) > 0)
 		{
-			$this->emetteur_code_banque 	   = $account->code_banque;
+			$this->emetteur_code_banque = $account->code_banque;
 			$this->emetteur_code_guichet       = $account->code_guichet;
 			$this->emetteur_numero_compte      = $account->number;
-			$this->emetteur_number_key		   = $account->cle_rib;
+			$this->emetteur_number_key = $account->cle_rib;
 			$this->emetteur_iban               = $account->iban;
 			$this->emetteur_bic                = $account->bic;
 
-			$this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS;		// Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+			$this->emetteur_ics                = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
 
 			$this->raison_sociale              = $account->proprio;
 		}
 
 		// Récupération info demandeur
 		$sql = "SELECT rowid, ref";
-		$sql.= " FROM";
-		$sql.= " ".MAIN_DB_PREFIX."prelevement_bons as pb";
-		$sql.= " WHERE pb.rowid = ".$this->id;
+		$sql .= " FROM";
+		$sql .= " ".MAIN_DB_PREFIX."prelevement_bons as pb";
+		$sql .= " WHERE pb.rowid = ".$this->id;
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
@@ -1876,7 +1876,7 @@ class BonPrelevement extends CommonObject
 			$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 			$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
 			$addressline1 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => "")));
-			$addressline2 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN)?' ':'').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => "")));
+			$addressline2 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => "")));
 			if ($addressline1)		$XML_SEPA_INFO .= '					<AdrLine>'.$addressline1.'</AdrLine>'.$CrLf;
 			if ($addressline2)		$XML_SEPA_INFO .= '					<AdrLine>'.$addressline2.'</AdrLine>'.$CrLf;
 			$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 741d106ab48..ea6ef4d0530 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -622,9 +622,14 @@ else
 
             // Name
             print '<tr><td class="titlefieldcreate fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
-            print '<td><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
-            print '<td><label for="firstname">'.$langs->trans("Firstname").'</label></td>';
-            print '<td><input name="firstname" id="firstname"type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname", 'alpha') ?GETPOST("firstname", 'alpha') : $object->firstname).'"></td></tr>';
+            print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
+            print '</tr>';
+
+            print '<tr>';
+            print '<td><label for="firstname">';
+            print $form->textwithpicto($langs->trans("Firstname"), $langs->trans("KeepEmptyIfGenericAddress")).'</label></td>';
+            print '<td colspan="3"><input name="firstname" id="firstname"type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname", 'alpha') ?GETPOST("firstname", 'alpha') : $object->firstname).'"></td>';
+            print '</tr>';
 
             // Company
             if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
@@ -715,19 +720,24 @@ else
             // Phone / Fax
             print '<tr><td>'.img_picto('', 'object_phoning').' '.$form->editfieldkey('PhonePro', 'phone_pro', '', $object, 0).'</td>';
             print '<td><input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" value="'.(GETPOSTISSET('phone_pro') ?GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
+            if ($conf->browser->layout == 'phone') print '</tr><tr>';
             print '<td>'.img_picto('', 'object_phoning').' '.$form->editfieldkey('PhonePerso', 'phone_perso', '', $object, 0).'</td>';
             print '<td><input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" value="'.(GETPOSTISSET('phone_perso') ?GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
 
             print '<tr><td>'.img_picto('', 'object_phoning_mobile').' '.$form->editfieldkey('PhoneMobile', 'phone_mobile', '', $object, 0).'</td>';
             print '<td><input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" value="'.(GETPOSTISSET('phone_mobile') ?GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
+            if ($conf->browser->layout == 'phone') print '</tr><tr>';
             print '<td>'.img_picto('', 'object_phoning_fax').' '.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-            print '<td><input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+            print '<td><input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td>';
+            print '</tr>';
 
             if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email; // Predefined with third party
 
             // Email
             print '<tr><td>'.img_picto('', 'object_email').' '.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '').'</td>';
             print '<td><input type="text" name="email" id="email" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td>';
+			print '</tr>';
+
             if (!empty($conf->mailing->enabled))
             {
             	$noemail = '';
@@ -743,12 +753,10 @@ else
             		}
             	}
 
+            	print '<tr>';
             	print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
 	            print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ?GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
-            }
-            else
-			      {
-          		print '<td colspan="2">&nbsp;</td>';
+	            print '</tr>';
             }
             print '</tr>';
 
@@ -829,7 +837,7 @@ else
             print $hookmanager->resPrint;
             if (empty($reshook))
             {
-            	print $object->showOptionals($extrafields, 'edit');
+            	print $object->showOptionals($extrafields, 'edit', $parameters);
             }
 
             print "</table><br>";
@@ -842,7 +850,7 @@ else
             print '<table class="border centpercent">';
 
             // Date To Birth
-            print '<tr><td width="20%"><label for="birthday">'.$langs->trans("DateToBirth").'</label></td><td width="30%">';
+            print '<tr><td><label for="birthday">'.$langs->trans("DateToBirth").'</label></td><td>';
             $form = new Form($db);
             if ($object->birthday)
             {
@@ -854,15 +862,16 @@ else
             }
             print '</td>';
 
-            print '<td colspan="2"><label for="birthday_alert">'.$langs->trans("Alert").'</label>: ';
+            print '<td><label for="birthday_alert">'.$langs->trans("Alert").'</label>: ';
             if ($object->birthday_alert)
             {
-                print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked></td>';
+                print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked>';
             }
             else
             {
-                print '<input type="checkbox" name="birthday_alert" id="birthday_alert"></td>';
+                print '<input type="checkbox" name="birthday_alert" id="birthday_alert">';
             }
+            print '</td>';
             print '</tr>';
 
             print "</table>";
@@ -971,7 +980,7 @@ else
 
             // Civility
             print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
-            print $formcompany->select_civility(GETPOSTISSET("civility_code") ?GETPOST("civility", "aZ09") : $object->civility_code, 'civility_code');
+            print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", "aZ09") : $object->civility_code, 'civility_code');
             print '</td></tr>';
 
             print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
@@ -1162,12 +1171,12 @@ else
 	        }
 
             // Other attributes
-            $parameters = array('colspan' => ' colspan="3"', 'cols'=>3);
+            $parameters = array('colspan' => ' colspan="3"', 'cols'=> '3');
             $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
             if (empty($reshook))
             {
-            	print $object->showOptionals($extrafields, 'edit');
+            	print $object->showOptionals($extrafields, 'edit', $parameters);
             }
 
             $object->load_ref_elements();
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 724a19bdbb8..efd521e9ec0 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -40,39 +40,39 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->projet->enabled)) {
+if (!empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("contracts","orders","companies","bills","products",'compta'));
+$langs->loadLangs(array("contracts", "orders", "companies", "bills", "products", 'compta'));
 
-$action=GETPOST('action', 'alpha');
-$confirm=GETPOST('confirm', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $socid = GETPOST('socid', 'int');
 $id = GETPOST('id', 'int');
-$ref=GETPOST('ref', 'alpha');
-$origin=GETPOST('origin', 'alpha');
-$originid=GETPOST('originid', 'int');
+$ref = GETPOST('ref', 'alpha');
+$origin = GETPOST('origin', 'alpha');
+$originid = GETPOST('originid', 'int');
 
-$datecontrat='';
-$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
+$datecontrat = '';
+$usehm = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
 
 // Security check
-if ($user->socid) $socid=$user->socid;
-$result=restrictedArea($user, 'contrat', $id);
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'contrat', $id);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contractcard','globalcard'));
+$hookmanager->initHooks(array('contractcard', 'globalcard'));
 
 $object = new Contrat($db);
 $extrafields = new ExtraFields($db);
 
 // Load object
-if ($id > 0 || ! empty($ref) && $action!='add') {
+if ($id > 0 || !empty($ref) && $action != 'add') {
 	$ret = $object->fetch($id, $ref);
 	if ($ret > 0)
 		$ret = $object->fetch_thirdparty();
@@ -444,8 +444,8 @@ if (empty($reshook))
 			$error++;
 		}
 
-	    $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
-	    $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
+	    $date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
+	    $date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 	    if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
 	    {
 		    setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
@@ -528,46 +528,46 @@ if (empty($reshook))
 				{
 					if ($price_base_type != 'HT')
 					{
-						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat/100)), 'MU');
+						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
 					}
 					else
 				    {
-						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU');
+						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
 
-			   	$desc=$prod->description;
-			   	$desc=dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+			   	$desc = $prod->description;
+			   	$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 				$fk_unit = $prod->fk_unit;
 			}
 			else
 			{
-				$pu_ht=GETPOST('price_ht');
+				$pu_ht = GETPOST('price_ht');
 				$price_base_type = 'HT';
-				$tva_tx=GETPOST('tva_tx')?str_replace('*', '', GETPOST('tva_tx')):0;		// tva_tx field may be disabled, so we use vat rate 0
-				$tva_npr=preg_match('/\*/', GETPOST('tva_tx'))?1:0;
-				$desc=$product_desc;
-				$fk_unit= GETPOST('units', 'alpha');
+				$tva_tx = GETPOST('tva_tx') ?str_replace('*', '', GETPOST('tva_tx')) : 0; // tva_tx field may be disabled, so we use vat rate 0
+				$tva_npr = preg_match('/\*/', GETPOST('tva_tx')) ? 1 : 0;
+				$desc = $product_desc;
+				$fk_unit = GETPOST('units', 'alpha');
 			}
 
-			$localtax1_tx=get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
-			$localtax2_tx=get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
+			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
 
 			// ajout prix achat
 			$fk_fournprice = $_POST['fournprice'];
-			if ( ! empty($_POST['buying_price']) )
+			if (!empty($_POST['buying_price']))
 			  $pa_ht = $_POST['buying_price'];
 			else
 			  $pa_ht = null;
 
-			$info_bits=0;
+			$info_bits = 0;
 			if ($tva_npr) $info_bits |= 0x01;
 
-			if (((! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance))
-				|| empty($conf->global->MAIN_USE_ADVANCED_PERMS) ) && ($price_min && (price2num($pu_ht)*(1-price2num($remise_percent)/100) < price2num($price_min))))
+			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance))
+				|| empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))))
 			{
 				$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
-				$result = -1 ;
+				$result = -1;
 			}
 			else
 			{
@@ -1239,39 +1239,39 @@ if ($action == 'create')
 	print "</td></tr>";
 
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled))
 	{
 		$langs->load('projects');
 
-		$formproject=new FormProjets($db);
+		$formproject = new FormProjets($db);
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
-		$formproject->select_projects(($soc->id>0?$soc->id:-1), $projectid, "projectid", 0, 0, 1, 1);
-		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid=' . $soc->id . '&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="valignmiddle text-plus-circle">' . $langs->trans("AddProject") . '</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
+		$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, "projectid", 0, 0, 1, 1);
+		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddProject").'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
 		print "</td></tr>";
 	}
 
 	print '<tr><td>'.$langs->trans("NotePublic").'</td><td class="tdtop">';
-	$doleditor=new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
 	if (empty($user->socid))
 	{
 		print '<tr><td>'.$langs->trans("NotePrivate").'</td><td class="tdtop">';
-		$doleditor=new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td></tr>';
 	}
 
 	// Other attributes
-	$parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
-	$reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+	$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3');
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
 	// Other attributes
 	if (empty($reshook)) {
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	print "</table>\n";
@@ -1389,62 +1389,62 @@ else
 
 		// Contract card
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-		$morehtmlref='';
-		if (! empty($modCodeContract->code_auto)) {
-			$morehtmlref.=$object->ref;
+		$morehtmlref = '';
+		if (!empty($modCodeContract->code_auto)) {
+			$morehtmlref .= $object->ref;
 		} else {
-			$morehtmlref.=$form->editfieldkey("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 3);
-			$morehtmlref.=$form->editfieldval("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 2);
+			$morehtmlref .= $form->editfieldkey("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 3);
+			$morehtmlref .= $form->editfieldval("", 'ref', $object->ref, $object, $user->rights->contrat->creer, 'string', '', 0, 2);
 		}
 
-		$morehtmlref.='<div class="refidno">';
+		$morehtmlref .= '<div class="refidno">';
 		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
+		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1, 'getFormatedCustomerRef');
 		// Ref supplier
-		$morehtmlref.='<br>';
-		$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
+		$morehtmlref .= '<br>';
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->contrat->creer, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
 		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 		// Project
-		if (! empty($conf->projet->enabled))
+		if (!empty($conf->projet->enabled))
 		{
 			$langs->load("projects");
-			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->contrat->creer)
 			{
 				if ($action != 'classify') {
-					$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
 				if ($action == 'classify') {
 					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-					$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-					$morehtmlref.='<input type="hidden" name="action" value="classin">';
-					$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-					$morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-					$morehtmlref.='</form>';
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+					$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
 				} else {
-					$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
 				}
 			} else {
-				if (! empty($object->fk_project)) {
+				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
 					$proj->fetch($object->fk_project);
-					$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-					$morehtmlref.=$proj->ref;
-					$morehtmlref.='</a>';
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
 				} else {
-					$morehtmlref.='';
+					$morehtmlref .= '';
 				}
 			}
 		}
-		$morehtmlref.='</div>';
+		$morehtmlref .= '</div>';
 
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'none', $morehtmlref);
@@ -1619,7 +1619,7 @@ else
 					// Quantity
 					print '<td class="center">'.$objp->qty.'</td>';
 					// Unit
-					if($conf->global->PRODUCT_USE_UNITS) print '<td class="left">'.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).'</td>';
+					if ($conf->global->PRODUCT_USE_UNITS) print '<td class="left">'.$langs->trans($object->lines[$cursorline - 1]->getLabelOfUnit()).'</td>';
 					// Discount
 					if ($objp->remise_percent > 0)
 					{
@@ -1717,32 +1717,32 @@ else
 					print '<td>';
 					if ($objp->fk_product)
 					{
-						$productstatic->id=$objp->fk_product;
-						$productstatic->type=$objp->ptype;
-						$productstatic->ref=$objp->pref;
-						$productstatic->entity=$objp->pentity;
+						$productstatic->id = $objp->fk_product;
+						$productstatic->type = $objp->ptype;
+						$productstatic->ref = $objp->pref;
+						$productstatic->entity = $objp->pentity;
 						print $productstatic->getNomUrl(1, '', 32);
-						print $objp->label?' - '.dol_trunc($objp->label, 32):'';
+						print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
 						print '<br>';
 					}
 					else
 					{
-						print $objp->label?$objp->label.'<br>':'';
+						print $objp->label ? $objp->label.'<br>' : '';
 					}
 
 					// editeur wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					$nbrows=ROWS_2;
-					if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-					$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-					$doleditor=new DolEditor('product_desc', $objp->description, '', 92, 'dolibarr_details', '', false, true, $enable, $nbrows, '90%');
+					$nbrows = ROWS_2;
+					if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+					$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
+					$doleditor = new DolEditor('product_desc', $objp->description, '', 92, 'dolibarr_details', '', false, true, $enable, $nbrows, '90%');
 					$doleditor->Create();
 
 					print '</td>';
 
 					// VAT
 					print '<td class="right">';
-					print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code?(' ('.$objp->vat_src_code.')'):''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
+					print $form->load_tva("eltva_tx", $objp->tva_tx.($objp->vat_src_code ? (' ('.$objp->vat_src_code.')') : ''), $mysoc, $object->thirdparty, $objp->fk_product, $objp->info_bits, $objp->product_type, 0, 1);
 					print '</td>';
 
 					// Price
@@ -1767,7 +1767,7 @@ else
 					// Discount
 					print '<td class="nowrap right"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
 
-					if (! empty($usemargins))
+					if (!empty($usemargins))
 					{
 						print '<td class="right">';
 						if ($objp->fk_product) print '<select id="fournprice" name="fournprice"></select>';
@@ -1885,27 +1885,27 @@ else
 			// Area with status and activation info of line
 			if ($object->statut > 0)
 			{
-				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ?' boxtablenobottom':'').'" width="100%">';
+				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
 				print '<tr class="oddeven">';
-				print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'</td>';
+				print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline - 1]->getLibStatut(4).'</td>';
 				print '<td width="30" class="right">';
 				if ($user->socid == 0)
 				{
 					if ($object->statut > 0 && $action != 'activateline' && $action != 'unactivateline')
 					{
-						$tmpaction='activateline';
-						$tmpactionpicto='play';
-						$tmpactiontext=$langs->trans("Activate");
+						$tmpaction = 'activateline';
+						$tmpactionpicto = 'play';
+						$tmpactiontext = $langs->trans("Activate");
 						if ($objp->statut == 4)
 						{
-							$tmpaction='unactivateline';
-							$tmpactionpicto='playstop';
-							$tmpactiontext=$langs->trans("Disable");
+							$tmpaction = 'unactivateline';
+							$tmpactionpicto = 'playstop';
+							$tmpactiontext = $langs->trans("Disable");
 						}
-						if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver))
+						if (($tmpaction == 'activateline' && $user->rights->contrat->activer) || ($tmpaction == 'unactivateline' && $user->rights->contrat->desactiver))
 						{
-							print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;ligne=' . $object->lines[$cursorline - 1]->id . '&amp;action=' . $tmpaction . '">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;ligne='.$object->lines[$cursorline - 1]->id.'&amp;action='.$tmpaction.'">';
 							print img_picto($tmpactiontext, $tmpactionpicto);
 							print '</a>';
 						}
@@ -2060,24 +2060,24 @@ else
 		// Form to add new line
 		if ($user->rights->contrat->creer && ($object->statut == 0))
 		{
-			$dateSelector=1;
+			$dateSelector = 1;
 
 			print "\n";
-			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline')?'#add':'#line_'.GETPOST('lineid')).'" method="POST">
+			print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid')).'" method="POST">
 			<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">
-			<input type="hidden" name="action" value="'.(($action != 'editline')?'addline':'updateline').'">
+			<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">
 			<input type="hidden" name="mode" value="">
 			<input type="hidden" name="id" value="'.$object->id.'">
 			';
 
 			print '<div class="div-table-responsive-no-min">';
-			print '<table id="tablelines" class="noborder noshadow" width="100%">';	// Array with (n*2)+1 lines
+			print '<table id="tablelines" class="noborder noshadow" width="100%">'; // Array with (n*2)+1 lines
 
 			// Form to add new line
 	   		if ($action != 'editline')
 			{
-				$forcetoshowtitlelines=1;
-				if (empty($object->multicurrency_code)) $object->multicurrency_code = $conf->currency;	// TODO Remove this when multicurrency supported on contracts
+				$forcetoshowtitlelines = 1;
+				if (empty($object->multicurrency_code)) $object->multicurrency_code = $conf->currency; // TODO Remove this when multicurrency supported on contracts
 
 				// Add free products/services
 				$object->formAddObjectLine(1, $mysoc, $soc);
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index b52a6939882..b7ec9574ccb 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -63,7 +63,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 		echo price($totalcontrat);
 	} ?></td>
 	<td class="right"><?php echo $objectlink->getLibStatut(7); ?></td>
-	<td class="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
 	<?php
 }
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 45fe792c81a..0d718c2abc2 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2017-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * 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
@@ -30,44 +30,54 @@
 // $backtopage may be defined
 // $triggermodname may be defined
 
-if (! empty($permissionedit) && empty($permissiontoadd)) $permissiontoadd = $permissionedit;	// For backward compatibility
+if (!empty($permissionedit) && empty($permissiontoadd)) $permissiontoadd = $permissionedit; // For backward compatibility
 
 if ($cancel)
 {
 	/*var_dump($cancel);
 	var_dump($backtopage);exit;*/
-	if (! empty($backtopage))
+	if (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
 	}
-	$action='';
+	$action = '';
 }
 
 // Action to add record
-if ($action == 'add' && ! empty($permissiontoadd))
+if ($action == 'add' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if ($object->fields[$key]['type'] == 'duration') {
+			if (GETPOST($key.'hour') == '' && GETPOST($key.'min') == '') continue; // The field was not submited to be edited
+		}
+		else {
+			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
+		}
+		// Ignore special fields
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;
 
 		// Set value to insert
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
 			$value = GETPOST($key, 'none');
-		} elseif ($object->fields[$key]['type']=='date') {
+		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
+		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
+		} elseif ($object->fields[$key]['type'] == 'duration') {
+			$value = 60 * 60 * GETPOST($key.'hour', 'int') + 60 * GETPOST($key.'min', 'int');
 		} elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) {
-			$value = price2num(GETPOST($key, 'none'));	// To fix decimal separator according to lang setup
+			$value = price2num(GETPOST($key, 'none')); // To fix decimal separator according to lang setup
 		} else {
 			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
 
-		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '' && ! is_null($val['default']) && $val['default'] == '(PROV)')
+		//var_dump($key.' '.$value.' '.$object->fields[$key]['type']);
+		$object->$key = $value;
+		if ($val['notnull'] > 0 && $object->$key == '' && !is_null($val['default']) && $val['default'] == '(PROV)')
 		{
 		    $object->$key = '(PROV)';
 		}
@@ -108,8 +118,16 @@ if ($action == 'update' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue; // Ignore special fields
+		// Check if field was submited to be edited
+		if ($object->fields[$key]['type'] == 'duration') {
+			if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) continue; // The field was not submited to be edited
+		}
+		else {
+			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
+		}
+		// Ignore special fields
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;
+
 		// Set value to update
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
 			$value = GETPOST($key, 'none');
@@ -117,6 +135,12 @@ if ($action == 'update' && !empty($permissiontoadd))
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
 		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+		} elseif ($object->fields[$key]['type'] == 'duration') {
+			if (GETPOST($key.'hour', 'int') != '' || GETPOST($key.'min', 'int') != '') {
+				$value = 60 * 60 * GETPOST($key.'hour', 'int') + 60 * GETPOST($key.'min', 'int');
+			} else {
+				$value = '';
+			}
 		} elseif (in_array($object->fields[$key]['type'], array('price', 'real'))) {
 			$value = price2num(GETPOST($key));
 		} else {
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/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 335c1b50111..eb15710eb7c 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -626,6 +626,7 @@ class CMailFile
 				}
 
 				// Force parameters
+				//dol_syslog("CMailFile::sendfile conf->global->".$keyforsmtpserver."=".$conf->global->$keyforsmtpserver." cpnf->global->".$keyforsmtpport."=".$conf->global->$keyforsmtpport, LOG_DEBUG);
 				if (!empty($conf->global->$keyforsmtpserver)) ini_set('SMTP', $conf->global->$keyforsmtpserver);
 				if (!empty($conf->global->$keyforsmtpport))   ini_set('smtp_port', $conf->global->$keyforsmtpport);
 
@@ -776,7 +777,7 @@ class CMailFile
 					else
 					{
 						if (empty($this->error)) $this->error = $result;
-						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>".$this->error, LOG_ERR);
 						$res = false;
 					}
 				}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index fc3336fdcbb..ef34ab5093f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -429,12 +429,12 @@ abstract class CommonObject
 	/**
 	 * @var integer|string $date_validation;
 	 */
-	public $date_validation;		// Date validation
+	public $date_validation; // Date validation
 
 	/**
 	 * @var integer|string $date_modification;
 	 */
-	public $date_modification;		// Date last change (tms field)
+	public $date_modification; // Date last change (tms field)
 
 	public $next_prev_filter;
 
@@ -548,10 +548,10 @@ abstract class CommonObject
 		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
 
 		$ret = '';
-		if ($option && $this->civility_id)
+		if ($option && $this->civility_code)
 		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_id) != "Civility".$this->civility_id) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_id).' ';
-			else $ret .= $this->civility_id.' ';
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';
+			else $ret .= $this->civility_code.' ';
 		}
 
 		$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
@@ -574,7 +574,7 @@ abstract class CommonObject
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 			$tmparray = getCountry($this->country_id, 'all');
 			$this->country_code = $tmparray['code'];
-			$this->country     = $tmparray['label'];
+			$this->country = $tmparray['label'];
 		}
 
         if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_cpde)))
@@ -602,123 +602,123 @@ abstract class CommonObject
 	{
 		global $conf, $langs;
 
-		$countriesusingstate=array('AU','US','IN','GB','ES','UK','TR');    // See also option MAIN_FORCE_STATE_INTO_ADDRESS
+		$countriesusingstate = array('AU', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also option MAIN_FORCE_STATE_INTO_ADDRESS
 
-		$contactid=0;
-		$thirdpartyid=0;
+		$contactid = 0;
+		$thirdpartyid = 0;
 		if ($this->element == 'societe')
 		{
-			$thirdpartyid=$this->id;
+			$thirdpartyid = $this->id;
 		}
 		if ($this->element == 'contact')
 		{
-			$contactid=$this->id;
-			$thirdpartyid=$object->fk_soc;
+			$contactid = $this->id;
+			$thirdpartyid = $object->fk_soc;
 		}
 		if ($this->element == 'user')
 		{
-			$contactid=$this->contact_id;
-			$thirdpartyid=$object->fk_soc;
+			$contactid = $this->contact_id;
+			$thirdpartyid = $object->fk_soc;
 		}
 
-		$out='<!-- BEGIN part to show address block -->';
+		$out = '<!-- BEGIN part to show address block -->';
 
-		$outdone=0;
+		$outdone = 0;
 		$coords = $this->getFullAddress(1, ', ', $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
 		if ($coords)
 		{
-			if (! empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax))
 			{
 				$namecoords = '';
-				if ( $this->element == 'contact' && ! empty($conf->global->MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS))
+				if ($this->element == 'contact' && !empty($conf->global->MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS))
 				{
-					$namecoords.= $object->name.'<br>';
+					$namecoords .= $object->name.'<br>';
 				}
-				$namecoords.= $this->getFullName($langs, 1).'<br>'.$coords;
+				$namecoords .= $this->getFullName($langs, 1).'<br>'.$coords;
 				// hideonsmatphone because copyToClipboard call jquery dialog that does not work with jmobile
-				$out.='<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
-				$out.=img_picto($langs->trans("Address"), 'object_address.png');
-				$out.='</a> ';
+				$out .= '<a href="#" class="hideonsmartphone" onclick="return copyToClipboard(\''.dol_escape_js($namecoords).'\',\''.dol_escape_js($langs->trans("HelpCopyToClipboard")).'\');">';
+				$out .= img_picto($langs->trans("Address"), 'object_address.png');
+				$out .= '</a> ';
 			}
-			$out.=dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
+			$out .= dol_print_address($coords, 'address_'.$htmlkey.'_'.$this->id, $this->element, $this->id, 1, ', '); $outdone++;
 			$outdone++;
 		}
 
-		if (! in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
+		if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
 				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
 		{
             if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
-                $out.=($outdone?' - ':'').$this->region.' - '.$this->state;
+                $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
             }
             else {
-                $out.=($outdone?' - ':'').$this->state;
+                $out .= ($outdone ? ' - ' : '').$this->state;
             }
 			$outdone++;
 		}
 
-		if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':'');
-		if (! empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
-			$out.=dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');
+		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
+			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
-		if (! empty($this->phone_pro)) {
-			$out.=dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+		if (!empty($this->phone_pro)) {
+			$out .= dol_print_phone($this->phone_pro, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
-		if (! empty($this->phone_mobile)) {
-			$out.=dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
+		if (!empty($this->phone_mobile)) {
+			$out .= dol_print_phone($this->phone_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
 		}
-		if (! empty($this->phone_perso)) {
-			$out.=dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso")); $outdone++;
+		if (!empty($this->phone_perso)) {
+			$out .= dol_print_phone($this->phone_perso, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePerso")); $outdone++;
 		}
-		if (! empty($this->office_phone)) {
-			$out.=dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
+		if (!empty($this->office_phone)) {
+			$out .= dol_print_phone($this->office_phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro")); $outdone++;
 		}
-		if (! empty($this->user_mobile)) {
-			$out.=dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
+		if (!empty($this->user_mobile)) {
+			$out .= dol_print_phone($this->user_mobile, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'mobile', $langs->trans("PhoneMobile")); $outdone++;
 		}
-		if (! empty($this->fax)) {
-			$out.=dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
+		if (!empty($this->fax)) {
+			$out .= dol_print_phone($this->fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
 		}
-		if (! empty($this->office_fax)) {
-			$out.=dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
+		if (!empty($this->office_fax)) {
+			$out .= dol_print_phone($this->office_fax, $this->country_code, $contactid, $thirdpartyid, 'AC_FAX', '&nbsp;', 'fax', $langs->trans("Fax")); $outdone++;
 		}
 
-		$out.='<div style="clear: both;"></div>';
-		$outdone=0;
-		if (! empty($this->email))
+		$out .= '<div style="clear: both;"></div>';
+		$outdone = 0;
+		if (!empty($this->email))
 		{
-			$out.=dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);
+			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);
 			$outdone++;
 		}
-		if (! empty($this->url))
+		if (!empty($this->url))
 		{
             //$out.=dol_print_url($this->url,'_goout',0,1);//steve changed to blank
-		    $out.=dol_print_url($this->url, '_blank', 0, 1);
+		    $out .= dol_print_url($this->url, '_blank', 0, 1);
 			$outdone++;
 		}
-		$out.='<div style="clear: both;">';
-		if (! empty($conf->socialnetworks->enabled))
+		$out .= '<div style="clear: both;">';
+		if (!empty($conf->socialnetworks->enabled))
 		{
-			if (is_array($this->socialnetworks) && count($this->socialnetworks)>0) {
+			if (is_array($this->socialnetworks) && count($this->socialnetworks) > 0) {
 				foreach ($this->socialnetworks as $key => $value) {
-					$out.=dol_print_socialnetworks($value, $this->id, $object->id, $key);
+					$out .= dol_print_socialnetworks($value, $this->id, $object->id, $key);
 					$outdone++;
 				}
 			} else {
-				if ($this->skype) $out.=dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				if ($this->skype) $out .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
 				$outdone++;
-				if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				if ($this->jabberid) $out .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
 				$outdone++;
-				if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				if ($this->twitter) $out .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
 				$outdone++;
-				if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				if ($this->facebook) $out .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
 				$outdone++;
-				if ($this->linkedin) $out.=dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				if ($this->linkedin) $out .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
 				$outdone++;
 			}
 		}
-		$out.='</div>';
+		$out .= '</div>';
 
-		$out.='<!-- END Part to show address block -->';
+		$out .= '<!-- END Part to show address block -->';
 
 		return $out;
 	}
@@ -1086,49 +1086,49 @@ abstract class CommonObject
         // phpcs:enable
 		global $langs;
 
-		$tab=array();
+		$tab = array();
 
-		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact";    // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact";
-		$sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
-		$sql.= ", tc.source, tc.element, tc.code, tc.libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
-		$sql.= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
-		$sql.= " WHERE ec.element_id =".$this->id;
-		$sql.= " AND ec.fk_c_type_contact=tc.rowid";
-		$sql.= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql.= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'";
-		$sql.= " AND tc.active=1";
-		if ($status >= 0) $sql.= " AND ec.statut = ".$status;
-		$sql.=" ORDER BY t.lastname ASC";
+		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user
+		if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
+		$sql .= ", tc.source, tc.element, tc.code, tc.libelle";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
+		$sql .= ", ".MAIN_DB_PREFIX."element_contact ec";
+		if ($source == 'internal') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		$sql .= " WHERE ec.element_id =".$this->id;
+		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
+		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";
+		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		if ($source == 'internal') $sql .= " AND tc.source = 'internal'";
+		if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";
+		$sql .= " AND tc.active=1";
+		if ($status >= 0) $sql .= " AND ec.statut = ".$status;
+		$sql .= " ORDER BY t.lastname ASC";
 
 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				if (! $list)
+				if (!$list)
 				{
-					$transkey="TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
-					$libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle);
-					$tab[$i]=array('source'=>$obj->source,'socid'=>$obj->socid,'id'=>$obj->id,
-								   'nom'=>$obj->lastname,      // For backward compatibility
+					$transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
+					$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
+					$tab[$i] = array('source'=>$obj->source, 'socid'=>$obj->socid, 'id'=>$obj->id,
+								   'nom'=>$obj->lastname, // For backward compatibility
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
 				}
 				else
 				{
-					$tab[$i]=$obj->id;
+					$tab[$i] = $obj->id;
 				}
 
 				$i++;
@@ -1900,23 +1900,23 @@ abstract class CommonObject
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		if (! empty($this->fields['fk_project']))		// Common case
+		if (!empty($this->fields['fk_project']))		// Common case
 		{
-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
-			$sql.= ' WHERE rowid = '.$this->id;
+			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
+			else $sql .= ' SET fk_project = NULL';
+			$sql .= ' WHERE rowid = '.$this->id;
 		}
 		elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
 		{
-			if ($projectid) $sql.= ' SET fk_project = '.$projectid;
-			else $sql.= ' SET fk_project = NULL';
-			$sql.= ' WHERE id = '.$this->id;
+			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
+			else $sql .= ' SET fk_project = NULL';
+			$sql .= ' WHERE id = '.$this->id;
 		}
 		else											// Special case for old architecture objects
 		{
-			if ($projectid) $sql.= ' SET fk_projet = '.$projectid;
-			else $sql.= ' SET fk_projet = NULL';
-			$sql.= ' WHERE rowid = '.$this->id;
+			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
+			else $sql .= ' SET fk_projet = NULL';
+			$sql .= ' WHERE rowid = '.$this->id;
 		}
 
 		dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
@@ -3851,19 +3851,19 @@ abstract class CommonObject
 					$totalWeight += $weight * $qty * $trueWeightUnit;
 				}
 				else {
-					$totalWeight += $weight * $qty;   // This may be wrong if we mix different units
+					$totalWeight += $weight * $qty; // This may be wrong if we mix different units
 				}
 			}
 			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 			{
 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
-				$trueVolumeUnit=pow(10, $volumeUnit);
+				$trueVolumeUnit = pow(10, $volumeUnit);
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
 			}
 			else
 			{
-				$totalVolume += $volume * $qty;   // This may be wrong if we mix different units
+				$totalVolume += $volume * $qty; // This may be wrong if we mix different units
 			}
 		}
 
@@ -4017,11 +4017,11 @@ abstract class CommonObject
 	 */
 	public function formAddObjectLine($dateSelector, $seller, $buyer, $defaulttpldir = '/core/tpl')
 	{
-		global $conf,$user,$langs,$object,$hookmanager,$extrafields;
+		global $conf, $user, $langs, $object, $hookmanager, $extrafields;
 		global $form;
 
 		// Line extrafield
-		if (! is_object($extrafields))
+		if (!is_object($extrafields))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
@@ -4108,15 +4108,15 @@ abstract class CommonObject
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
-					$res=@include $tpl;
+					$res = @include $tpl;
 				} else {
-					$res=include $tpl; // for debug
+					$res = include $tpl; // for debug
 				}
 				if ($res) break;
 			}
 		}
 
-		$i	 = 0;
+		$i = 0;
 
 		print "<tbody>\n";
 		foreach ($this->lines as $line)
@@ -4130,12 +4130,12 @@ abstract class CommonObject
 				if (empty($line->fk_parent_line))
 				{
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
-					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
 				else
 				{
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
-					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
 			}
 			if (empty($reshook))
@@ -4167,21 +4167,21 @@ abstract class CommonObject
 	 */
 	public function printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected = 0, $extrafields = null, $defaulttpldir = '/core/tpl')
 	{
-		global $conf,$langs,$user,$object,$hookmanager;
+		global $conf, $langs, $user, $object, $hookmanager;
 		global $form;
-		global $object_rights, $disableedit, $disablemove, $disableremove;   // TODO We should not use global var for this !
+		global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !
 
 		$object_rights = $this->getRights();
 
-		$element=$this->element;
+		$element = $this->element;
 
-		$text=''; $description=''; $type=0;
+		$text = ''; $description = ''; $type = 0;
 
 		// Show product and description
-		$type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type);
+		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
 		// Try to enhance type detection using date_start and date_end for free lines where type was not saved.
-		if (! empty($line->date_start)) $type=1; // deprecated
-		if (! empty($line->date_end)) $type=1; // deprecated
+		if (!empty($line->date_start)) $type = 1; // deprecated
+		if (!empty($line->date_end)) $type = 1; // deprecated
 
 		// Ligne en mode visu
 		if ($action != 'editline' || $selected != $line->id)
@@ -4318,19 +4318,19 @@ abstract class CommonObject
 		print '<td class="right">'.$langs->trans('ReductionShort').'</td>';
         print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
         print '</tr>';
-		$i	 = 0;
+		$i = 0;
 
-		if (! empty($this->lines))
+		if (!empty($this->lines))
 		{
 			foreach ($this->lines as $line)
 			{
-				if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))
 				{
 					if (empty($line->fk_parent_line))
 					{
-						$parameters=array('line'=>$line, 'i'=>$i);
-						$action='';
-						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+						$parameters = array('line'=>$line, 'i'=>$i);
+						$action = '';
+						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 					}
 				}
 				else
@@ -4623,48 +4623,48 @@ abstract class CommonObject
 	{
 		global $conf, $langs, $user, $hookmanager, $action;
 
-		$srctemplatepath='';
+		$srctemplatepath = '';
 
-		$parameters = array('modelspath'=>$modelspath,'modele'=>$modele,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'hidedesc'=>$hidedesc,'hideref'=>$hideref, 'moreparams'=>$moreparams);
+		$parameters = array('modelspath'=>$modelspath, 'modele'=>$modele, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'hidedesc'=>$hidedesc, 'hideref'=>$hideref, 'moreparams'=>$moreparams);
 		$reshook = $hookmanager->executeHooks('commonGenerateDocument', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 		if (empty($reshook))
 		{
-		    dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs)?$outputlangs->defaultlang:'null'));
+		    dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
 		    // Increase limit for PDF build
-		    $err=error_reporting();
+		    $err = error_reporting();
 		    error_reporting(0);
 		    @set_time_limit(120);
 		    error_reporting($err);
 
 		    // If selected model is a filename template (then $modele="modelname" or "modelname:filename")
-		    $tmp=explode(':', $modele, 2);
-		    if (! empty($tmp[1]))
+		    $tmp = explode(':', $modele, 2);
+		    if (!empty($tmp[1]))
 		    {
-			    $modele=$tmp[0];
-			    $srctemplatepath=$tmp[1];
+			    $modele = $tmp[0];
+			    $srctemplatepath = $tmp[1];
 		    }
 
 		    // Search template files
-			$file='';
-			$classname='';
-			$filefound=0;
-		    $dirmodels=array('/');
-		    if (is_array($conf->modules_parts['models'])) $dirmodels=array_merge($dirmodels, $conf->modules_parts['models']);
-		    foreach($dirmodels as $reldir)
+			$file = '';
+			$classname = '';
+			$filefound = 0;
+		    $dirmodels = array('/');
+		    if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+		    foreach ($dirmodels as $reldir)
 		    {
-			    foreach(array('doc','pdf') as $prefix)
+			    foreach (array('doc', 'pdf') as $prefix)
 			    {
-				    if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php";     // Member module use prefix_module.class.php
+				    if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
 				    else $file = $prefix."_".$modele.".modules.php";
 
 				    // On verifie l'emplacement du modele
-				    $file=dol_buildpath($reldir.$modelspath.$file, 0);
+				    $file = dol_buildpath($reldir.$modelspath.$file, 0);
 				    if (file_exists($file))
 				    {
-					    $filefound=1;
-					    $classname=$prefix.'_'.$modele;
+					    $filefound = 1;
+					    $classname = $prefix.'_'.$modele;
 					    break;
 				    }
 			    }
@@ -4674,7 +4674,7 @@ abstract class CommonObject
 		    // If generator was found
 		    if ($filefound)
 		    {
-			    global $db;  // Required to solve a conception default making an include of code using $db instead of $this->db just after.
+			    global $db; // Required to solve a conception default making an include of code using $db instead of $this->db just after.
 
 			    require_once $file;
 
@@ -4683,32 +4683,32 @@ abstract class CommonObject
 			    // If generator is ODT, we must have srctemplatepath defined, if not we set it.
 			    if ($obj->type == 'odt' && empty($srctemplatepath))
 			    {
-				    $varfortemplatedir=$obj->scandir;
-				    if ($varfortemplatedir && ! empty($conf->global->$varfortemplatedir))
+				    $varfortemplatedir = $obj->scandir;
+				    if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir))
 				    {
-					    $dirtoscan=$conf->global->$varfortemplatedir;
+					    $dirtoscan = $conf->global->$varfortemplatedir;
 
-					    $listoffiles=array();
+					    $listoffiles = array();
 
 					    // Now we add first model found in directories scanned
-					    $listofdir=explode(',', $dirtoscan);
-					    foreach($listofdir as $key => $tmpdir)
+					    $listofdir = explode(',', $dirtoscan);
+					    foreach ($listofdir as $key => $tmpdir)
 					    {
-						    $tmpdir=trim($tmpdir);
-						    $tmpdir=preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
-						    if (! $tmpdir) { unset($listofdir[$key]); continue; }
+						    $tmpdir = trim($tmpdir);
+						    $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+						    if (!$tmpdir) { unset($listofdir[$key]); continue; }
 						    if (is_dir($tmpdir))
 						    {
-							    $tmpfiles=dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
-							    if (count($tmpfiles)) $listoffiles=array_merge($listoffiles, $tmpfiles);
+							    $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
+							    if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 						    }
 					    }
 
 					    if (count($listoffiles))
 					    {
-						    foreach($listoffiles as $record)
+						    foreach ($listoffiles as $record)
 						    {
-							    $srctemplatepath=$record['fullname'];
+							    $srctemplatepath = $record['fullname'];
 							    break;
 						    }
 					    }
@@ -4716,27 +4716,27 @@ abstract class CommonObject
 
 				    if (empty($srctemplatepath))
 				    {
-					    $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
+					    $this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
 					    return -1;
 				    }
 			    }
 
-			    if ($obj->type == 'odt' && ! empty($srctemplatepath))
+			    if ($obj->type == 'odt' && !empty($srctemplatepath))
 			    {
-				    if (! dol_is_file($srctemplatepath))
+				    if (!dol_is_file($srctemplatepath))
 				    {
-					    $this->error='ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
+					    $this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
 					    return -1;
 				    }
 			    }
 
 			    // We save charset_output to restore it because write_file can change it if needed for
 			    // output format that does not support UTF8.
-			    $sav_charset_output=$outputlangs->charset_output;
+			    $sav_charset_output = $outputlangs->charset_output;
 
 			    if (in_array(get_class($this), array('Adherent')))
 			    {
-				    $arrayofrecords = array();   // The write_file of templates of adherent class need this var
+				    $arrayofrecords = array(); // The write_file of templates of adherent class need this var
 				    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
 			    }
 			    else
@@ -4747,46 +4747,46 @@ abstract class CommonObject
 
 			    if ($resultwritefile > 0)
 			    {
-				    $outputlangs->charset_output=$sav_charset_output;
+				    $outputlangs->charset_output = $sav_charset_output;
 
 				    // We delete old preview
 				    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				    dol_delete_preview($this);
 
 				    // Index file in database
-				    if (! empty($obj->result['fullpath']))
+				    if (!empty($obj->result['fullpath']))
 				    {
 					    $destfull = $obj->result['fullpath'];
 					    $upload_dir = dirname($destfull);
 					    $destfile = basename($destfull);
 					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-					    if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+					    if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
 					    {
 						    $filename = basename($destfile);
 						    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 						    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
 						    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-						    $ecmfile=new EcmFiles($this->db);
-						    $result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);
+						    $ecmfile = new EcmFiles($this->db);
+						    $result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
 
 						     // Set the public "share" key
 						    $setsharekey = false;
 						    if ($this->element == 'propal')
 						    {
-							    $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL;	// Replace this with 1 when feature to make online signature is ok
-							    if ($useonlinesignature) $setsharekey=true;
-							    if (! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey=true;
+							    $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
+							    if ($useonlinesignature) $setsharekey = true;
+							    if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
 						    }
-						    if ($this->element == 'commande' && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
-							    $setsharekey=true;
+						    if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey = true;
 						    }
-						    if ($this->element == 'facture' && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
-							    $setsharekey=true;
+						    if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey = true;
 						    }
-						    if ($this->element == 'bank_account' && ! empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
-							    $setsharekey=true;
+						    if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+							    $setsharekey = true;
 						    }
 
 						    if ($setsharekey) {
@@ -4799,11 +4799,11 @@ abstract class CommonObject
 
 						    if ($result > 0)
 						     {
-							    $ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
+							    $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
 							    $ecmfile->fullpath_orig = '';
 							    $ecmfile->gen_or_uploaded = 'generated';
-							    $ecmfile->description = '';    // indexed content
-							    $ecmfile->keyword = '';        // keyword content
+							    $ecmfile->description = ''; // indexed content
+							    $ecmfile->keyword = ''; // keyword content
 							    $result = $ecmfile->update($user);
 							    if ($result < 0) {
 								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
@@ -4814,11 +4814,11 @@ abstract class CommonObject
 							    $ecmfile->entity = $conf->entity;
 							    $ecmfile->filepath = $rel_dir;
 							    $ecmfile->filename = $filename;
-							    $ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
+							    $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
 							    $ecmfile->fullpath_orig = '';
 							    $ecmfile->gen_or_uploaded = 'generated';
-							    $ecmfile->description = '';    // indexed content
-							    $ecmfile->keyword = '';        // keyword content
+							    $ecmfile->description = ''; // indexed content
+							    $ecmfile->keyword = ''; // keyword content
 							    $ecmfile->src_object_type = $this->table_element;
 							    $ecmfile->src_object_id   = $this->id;
 
@@ -4834,15 +4834,15 @@ abstract class CommonObject
 						    //var_dump($obj->update_main_doc_field);exit;
 
 						    // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
-						    $update_main_doc_field=0;
-						    if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1;
-						    if ($update_main_doc_field && ! empty($this->table_element))
+						    $update_main_doc_field = 0;
+						    if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
+						    if ($update_main_doc_field && !empty($this->table_element))
 						    {
 							    $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
-							    $sql.= ' WHERE rowid = '.$this->id;
+							    $sql .= ' WHERE rowid = '.$this->id;
 
 							    $resql = $this->db->query($sql);
-							    if (! $resql) {
+							    if (!$resql) {
 									dol_print_error($this->db);
 								} else {
 							        $this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
@@ -4862,14 +4862,14 @@ abstract class CommonObject
 			    }
 			    else
 			    {
-				    $outputlangs->charset_output=$sav_charset_output;
+				    $outputlangs->charset_output = $sav_charset_output;
 				    dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
 				    return -1;
 			    }
 		    }
 		    else
 		    {
-			    $this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
+			    $this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			    dol_print_error('', $this->error);
 			    return -1;
 		    }
@@ -4963,26 +4963,26 @@ abstract class CommonObject
 	public function call_trigger($trigger_name, $user)
 	{
 		// phpcs:enable
-		global $langs,$conf;
+		global $langs, $conf;
 
-		if (! is_object($langs)) {	// If lang was not defined, we set it. It is required by run_triggers.
+		if (!is_object($langs)) {	// If lang was not defined, we set it. It is required by run_triggers.
 			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 			$langs = new Translate('', $conf);
 		}
 
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($this->db);
-		$result=$interface->run_triggers($trigger_name, $this, $user, $langs, $conf);
+		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+		$interface = new Interfaces($this->db);
+		$result = $interface->run_triggers($trigger_name, $this, $user, $langs, $conf);
 
 		if ($result < 0)
 		{
 			if (!empty($this->errors))
 			{
-				$this->errors=array_unique(array_merge($this->errors, $interface->errors));   // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
+				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
 			}
 			else
 			{
-				$this->errors=$interface->errors;
+				$this->errors = $interface->errors;
 			}
 		}
 		return $result;
@@ -5626,14 +5626,12 @@ abstract class CommonObject
 
 		$objectid = $this->id;
 
-
 		if ($computed)
 		{
 			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
 			else return '';
 		}
 
-
 		// Set value of $morecss. For this, we use in priority showsize from parameters, then $val['css'] then autodefine
 		if (empty($morecss) && !empty($val['css']))
 		{
@@ -5689,6 +5687,10 @@ abstract class CommonObject
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
 		}
+		elseif (in_array($type, array('duration')))
+		{
+			$out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1);
+		}
 		elseif (in_array($type, array('int', 'integer')))
 		{
 			$tmp = explode(',', $size);
@@ -6088,77 +6090,77 @@ abstract class CommonObject
 							}
 
 							if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-								$data[$obj->rowid]=$labeltoshow;
+								$data[$obj->rowid] = $labeltoshow;
 							}
 
-							if (! empty($InfoFieldList[3]) && $parentField) {
-								$parent = $parentName . ':' . $obj->{$parentField};
+							if (!empty($InfoFieldList[3]) && $parentField) {
+								$parent = $parentName.':'.$obj->{$parentField};
 							}
 
-							$data[$obj->rowid]=$labeltoshow;
+							$data[$obj->rowid] = $labeltoshow;
 						}
 
-						$i ++;
+						$i++;
 					}
 					$this->db->free($resql);
 
-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
 				} else {
-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
 			$param_list_array = explode(':', $param_list[0]);
-			$showempty=(($required && $default != '')?0:1);
+			$showempty = (($required && $default != '') ? 0 : 1);
 
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, empty($val['disabled'])?0:1);
+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, empty($val['disabled']) ? 0 : 1);
 
-			if (! empty($param_list_array[2]))		// If we set to add a create button
+			if (!empty($param_list_array[2]))		// If we set to add a create button
 			{
-				if (! GETPOSTISSET('backtopage') && empty($val['disabled']))	// To avoid to open several infinitely the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
+				if (!GETPOSTISSET('backtopage') && empty($val['disabled']))	// To avoid to open several infinitely the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
 				{
-		   			list($class,$classfile)=explode(':', $param_list[0]);
-		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
-		   			else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
+		   			list($class, $classfile) = explode(':', $param_list[0]);
+		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
+		   			else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
 		   			$paramforthenewlink = '';
-		   			$paramforthenewlink .= (GETPOSTISSET('action')?'&action='.GETPOST('action', 'aZ09'):'');
-		   			$paramforthenewlink .= (GETPOSTISSET('id')?'&id='.GETPOST('id', 'int'):'');
+		   			$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');
+		   			$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');
 		   			$paramforthenewlink .= '&fk_'.strtolower($class).'=--IDFORBACKTOPAGE--';
 		   			// TODO Add Javascript code to add input fields already filled into $paramforthenewlink so we won't loose them when going back to main page
-		   			$out.='<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+		   			$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				}
 			}
 		}
 		elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'array')
 		{
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
 
-			$out='';
+			$out = '';
 
 			$inputs = array();
-			if(! empty($value)) {
-				foreach($value as $option) {
-					$out.= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-					$out.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $morecss).'<br></span>';
+			if (!empty($value)) {
+				foreach ($value as $option) {
+					$out .= '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
+					$out .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', $option, $moreparam, '', '', $morecss).'<br></span>';
 				}
 			}
 
-			$out.= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+			$out .= '<a id="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_add" href="javascript:;"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 
 			$newInput = '<span><a class="'.dol_escape_htmltag($keyprefix.$key.$keysuffix).'_del" href="javascript:;"><span class="fa fa-minus-circle valignmiddle"></span></a> ';
-			$newInput.= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $morecss).'<br></span>';
+			$newInput .= $this->showInputField($newval, $keyprefix.$key.$keysuffix.'[]', '', $moreparam, '', '', $morecss).'<br></span>';
 
-			if(! empty($conf->use_javascript_ajax)) {
-				$out.= '
+			if (!empty($conf->use_javascript_ajax)) {
+				$out .= '
 					<script>
 					$(document).ready(function() {
 						$("a#'.dol_escape_js($keyprefix.$key.$keysuffix).'_add").click(function() {
@@ -6239,7 +6241,6 @@ abstract class CommonObject
             $type = 'sellist';
         }
 
-
 		$langfile = $val['langfile'];
 		$list = $val['list'];
 		$help = $val['help'];
@@ -6313,9 +6314,16 @@ abstract class CommonObject
 				$value = '';
 			}
 		}
+		elseif ($type == 'duration')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			if (!is_null($value) && $value !== '') {
+				$value = convertSecondToTime($value, 'allhourmin');
+			}
+		}
 		elseif ($type == 'double' || $type == 'real')
 		{
-			if (!empty($value)) {
+			if (!is_null($value) && $value !== '') {
 				$value = price($value);
 			}
 		}
@@ -6341,7 +6349,9 @@ abstract class CommonObject
 		}
 		elseif ($type == 'price')
 		{
-			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
+			if (!is_null($value) && $value !== '') {
+				$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
+			}
 		}
 		elseif ($type == 'select')
 		{
@@ -6561,7 +6571,8 @@ abstract class CommonObject
 
 
 	/**
-	 * Function to show lines of extrafields with output datas
+	 * Function to show lines of extrafields with output datas.
+	 * This function is responsible to output the <tr> and <td> according to correct number of columns received into $params['colspan']
 	 *
 	 * @param 	Extrafields $extrafields    Extrafield Object
 	 * @param 	string      $mode           Show output (view) or input (edit) for extrafield
@@ -6614,10 +6625,19 @@ abstract class CommonObject
 				// Load language if required
 				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
 
-				$colspan = '3';
+				$colspan = '';
 				if (is_array($params) && count($params) > 0) {
-					if (array_key_exists('colspan', $params)) {
-						$colspan = $params['colspan'];
+					if (array_key_exists('cols', $params)) {
+						$colspan = $params['cols'];
+					}
+					elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.
+						$reg = array();
+						if (preg_match('/colspan="(\d+)"/', $params['colspan'], $reg)) {
+							$colspan = $reg[1];
+						}
+						else {
+							$colspan = $params['colspan'];
+						}
 					}
 				}
 
@@ -6659,7 +6679,7 @@ abstract class CommonObject
                         }
                     }
 
-					$out .= $extrafields->showSeparator($key, $this);
+					$out .= $extrafields->showSeparator($key, $this, ($colspan + 1));
 				}
 				else
 				{
@@ -6679,9 +6699,9 @@ abstract class CommonObject
 					$domData .= ' data-targetelement="'.$this->element.'"';
 					$domData .= ' data-targetid="'.$this->id.'"';
 
-					$html_id = !empty($this->id) ? 'extrarow-'.$this->element.'_'.$key.'_'.$this->id : '';
+					$html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id);
 
-					$out .= '<tr id="'.$html_id.'" '.$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';
+					$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';
 
 					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan = '0'; }
 
@@ -6725,8 +6745,7 @@ abstract class CommonObject
 
 					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
 
-					$out .= '<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
-					//$out .='<td id="'.$html_id.'" class="'.$this->element.'_extras_'.$key.'">';
+					$out .= '<td '.($html_id ? 'id="'.$html_id.'" ' : '').'class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 
 					switch ($mode) {
 						case "view":
@@ -7155,7 +7174,7 @@ abstract class CommonObject
 	{
 		if (is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='array') return true;
+			if (isset($info['type']) && $info['type'] == 'array') return true;
 			else return false;
 		}
 		return false;
@@ -7169,10 +7188,26 @@ abstract class CommonObject
 	 */
 	public function isDate($info)
 	{
-		if (isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true;
+		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;
 		return false;
 	}
 
+	/**
+	 * Function test if type is duration
+	 *
+	 * @param   array   $info   content informations of field
+	 * @return  bool			true if field of type duration
+	 */
+	public function isDuration($info)
+	{
+		if (is_array($info))
+		{
+			if (isset($info['type']) && ($info['type'] == 'duration')) return true;
+			else return false;
+		}
+		else return false;
+	}
+
 	/**
 	 * Function test if type is integer
 	 *
@@ -7183,7 +7218,7 @@ abstract class CommonObject
 	{
 		if (is_array($info))
 		{
-			if (isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i', $info['type']))) return true;
+			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
 			else return false;
 		}
 		else return false;
@@ -7215,7 +7250,7 @@ abstract class CommonObject
 	{
 		if (is_array($info))
 		{
-			if(isset($info['type']) && $info['type']=='text') return true;
+			if (isset($info['type']) && $info['type'] == 'text') return true;
 			else return false;
 		}
 		return false;
@@ -7231,7 +7266,7 @@ abstract class CommonObject
 	{
 		if (is_array($info))
 		{
-			if(isset($info['notnull']) && $info['notnull']!='1') return true;
+			if (isset($info['notnull']) && $info['notnull'] != '1') return true;
 			else return false;
 		}
 		return true;
@@ -7247,7 +7282,7 @@ abstract class CommonObject
 	{
 		if (is_array($info))
 		{
-			if(isset($info['notnull']) && $info['notnull']=='-1') return true;
+			if (isset($info['notnull']) && $info['notnull'] == '-1') return true;
 			else return false;
 		}
 		return false;
@@ -7263,7 +7298,7 @@ abstract class CommonObject
 	{
 		if (is_array($info))
 		{
-			if(isset($info['index']) && $info['index']==true) return true;
+			if (isset($info['index']) && $info['index'] == true) return true;
 			else return false;
 		}
 		return false;
@@ -7307,27 +7342,32 @@ abstract class CommonObject
 					$queryarray[$field] = null;
 				}
 			}
-			elseif($this->isInt($info))
+			elseif ($this->isDuration($info))
 			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field]=$conf->entity;
+				// $this->{$field} may be null, '', 0, '0', 123, '123'
+				if ($this->{$field} != '' || !empty($info['notnull'])) $queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1
+				else $queryarray[$field] = null;
+			}
+			elseif ($this->isInt($info) || $this->isFloat($info))
+			{
+				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
 				else
 				{
-					$queryarray[$field] = (int) $this->{$field};
-					if (empty($queryarray[$field])) $queryarray[$field]=0;		// May be reset to null later if property 'notnull' is -1 for this field.
+					// $this->{$field} may be null, '', 0, '0', 123, '123'
+					if ($this->{$field} != '' || !empty($info['notnull'])) {
+						if ($this->isInt($info)) $queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
+						if ($this->isFloat($info)) $queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
+					}
+					else $queryarray[$field] = null;
 				}
 			}
-			elseif($this->isFloat($info))
-			{
-				$queryarray[$field] = (double) $this->{$field};
-				if (empty($queryarray[$field])) $queryarray[$field]=0;
-			}
 			else
 			{
 				$queryarray[$field] = $this->{$field};
 			}
 
 			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null;
+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null; // May force 0 to null
 		}
 
 		return $queryarray;
@@ -7370,7 +7410,11 @@ abstract class CommonObject
 					}
 					else
 					{
-						$this->{$field} = (int) $obj->{$field};
+						if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
+							$this->{$field} = (int) $obj->{$field};
+						} else {
+							$this->{$field} = null;
+						}
 					}
 				}
 			}
@@ -7383,7 +7427,11 @@ abstract class CommonObject
 				}
 				else
 				{
-					$this->{$field} = (double) $obj->{$field};
+					if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
+						$this->{$field} = (double) $obj->{$field};
+					} else {
+						$this->{$field} = null;
+					}
 				}
 			}
 			else
@@ -7417,7 +7465,7 @@ abstract class CommonObject
 	protected function quote($value, $fieldsentry)
 	{
 		if (is_null($value)) return 'NULL';
-		elseif (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value");
+		elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) return $this->db->escape("$value");
 		else return "'".$this->db->escape($value)."'";
 	}
 
@@ -7435,13 +7483,14 @@ abstract class CommonObject
 
 		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id;
-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
-		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref']=dol_string_nospecial($fieldvalues['ref']);					// If field is a ref,we sanitize data
+
+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);
+		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;
+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
+		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref,we sanitize data
 
 		$keys = array();
 		$values = array();
@@ -7452,55 +7501,55 @@ abstract class CommonObject
 		}
 
 		// Clean and check mandatory
-		foreach($keys as $key)
+		foreach ($keys as $key)
 		{
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]='';
-			if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]='';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default']))
+			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && !isset($values[$key]) && is_null($this->fields[$key]['default']))
 			{
 				$error++;
-				$this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
+				$this->errors[] = $langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
 			}
 
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null';
-			if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key] = 'null';
+			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';
 		}
 
 		if ($error) return -1;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= ' ('.implode(", ", $keys).')';
-			$sql.= ' VALUES ('.implode(", ", $values).')';
+			$sql .= ' ('.implode(", ", $keys).')';
+			$sql .= ' VALUES ('.implode(", ", $values).')';
 
 			$res = $this->db->query($sql);
-			if ($res===false) {
+			if ($res === false) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 		}
 
 		// If we have a field ref with a default value of (PROV)
-		if (! $error)
+		if (!$error)
 		{
-		    if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && ! is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)')
+		    if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && !is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)')
 		    {
-		        $sql="UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE ref = '(PROV)' AND rowid = ".$this->id;
+		        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE ref = '(PROV)' AND rowid = ".$this->id;
 		        $resqlupdate = $this->db->query($sql);
 
-		        if ($resqlupdate===false)
+		        if ($resqlupdate === false)
 		        {
 		            $error++;
 		            $this->errors[] = $this->db->lasterror();
@@ -7667,12 +7716,13 @@ abstract class CommonObject
 
 		$error = 0;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		$fieldvalues = $this->setSaveQuery();
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id;
-		unset($fieldvalues['rowid']);	// The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
+
+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);
+		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;
+		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
 
 		$keys = array();
 		$values = array();
@@ -8040,11 +8090,11 @@ abstract class CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorystatic = new Categorie($this->db);
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_" . $categorystatic->MAP_CAT_TABLE[$type] . " (fk_categorie, fk_product)";
-		$sql.= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_" . $categorystatic->MAP_CAT_TABLE[$type];
-		$sql.= " WHERE fk_product = '".$fromId."'";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".$categorystatic->MAP_CAT_TABLE[$type]." (fk_categorie, fk_product)";
+		$sql .= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_".$categorystatic->MAP_CAT_TABLE[$type];
+		$sql .= " WHERE fk_product = '".$fromId."'";
 
-		if (! $this->db->query($sql))
+		if (!$this->db->query($sql))
 		{
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index d35ddf946fb..76a65e54d2d 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -178,7 +178,7 @@ class Conf
 
 					if ($value && preg_match('/^MAIN_MODULE_/', $key))
 					{
-						$reg=array();
+						$reg = array();
 						// If this is constant for a new tab page activated by a module. It initializes modules_parts['tabs'].
 						if (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_TABS_/i', $key))
 						{
@@ -224,11 +224,11 @@ class Conf
         }
 
         // Include other local consts.php files and fetch their values to the corresponding database constants.
-        if (! empty($this->global->LOCAL_CONSTS_FILES)) {
+        if (!empty($this->global->LOCAL_CONSTS_FILES)) {
             $filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);
             foreach ($filesList as $file) {
-                $file=dol_sanitizeFileName($file);
-                include_once DOL_DOCUMENT_ROOT . "/".$file."/".$file."_consts.php";	// This file can run code like setting $this->global->XXX vars.
+                $file = dol_sanitizeFileName($file);
+                include_once DOL_DOCUMENT_ROOT."/".$file."/".$file."_consts.php"; // This file can run code like setting $this->global->XXX vars.
             }
         }
 
@@ -326,33 +326,33 @@ class Conf
 		}
 
 		// For mycompany storage
-		$this->mycompany->multidir_output	= array($this->entity => $rootfordata."/mycompany");
-		$this->mycompany->multidir_temp		= array($this->entity => $rootfordata."/mycompany/temp");
+		$this->mycompany->multidir_output = array($this->entity => $rootfordata."/mycompany");
+		$this->mycompany->multidir_temp = array($this->entity => $rootfordata."/mycompany/temp");
 		// For backward compatibility
-		$this->mycompany->dir_output=$rootfordata."/mycompany";
-		$this->mycompany->dir_temp=$rootfordata."/mycompany/temp";
+		$this->mycompany->dir_output = $rootfordata."/mycompany";
+		$this->mycompany->dir_temp = $rootfordata."/mycompany/temp";
 
 		// For admin storage
-		$this->admin->dir_output=$rootfordata.'/admin';
-		$this->admin->dir_temp=$rootfordata.'/admin/temp';
+		$this->admin->dir_output = $rootfordata.'/admin';
+		$this->admin->dir_temp = $rootfordata.'/admin/temp';
 
 		// For user storage
-		$this->user->multidir_output	= array($this->entity => $rootfordata."/users");
-		$this->user->multidir_temp		= array($this->entity => $rootfordata."/users/temp");
+		$this->user->multidir_output = array($this->entity => $rootfordata."/users");
+		$this->user->multidir_temp = array($this->entity => $rootfordata."/users/temp");
 		// For backward compatibility
-		$this->user->dir_output=$rootforuser."/users";
-		$this->user->dir_temp=$rootforuser."/users/temp";
+		$this->user->dir_output = $rootforuser."/users";
+		$this->user->dir_temp = $rootforuser."/users/temp";
 
 		// For usergroup storage
-		$this->usergroup->dir_output=$rootforuser."/usergroups";
-		$this->usergroup->dir_temp=$rootforuser."/usergroups/temp";
+		$this->usergroup->dir_output = $rootforuser."/usergroups";
+		$this->usergroup->dir_temp = $rootforuser."/usergroups/temp";
 
 		// For proposal storage
-		$this->propal->multidir_output	= array($this->entity => $rootfordata."/propale");
-		$this->propal->multidir_temp	= array($this->entity => $rootfordata."/propale/temp");
+		$this->propal->multidir_output = array($this->entity => $rootfordata."/propale");
+		$this->propal->multidir_temp = array($this->entity => $rootfordata."/propale/temp");
 		// For backward compatibility
-		$this->propal->dir_output=$rootfordata."/propale";
-		$this->propal->dir_temp=$rootfordata."/propale/temp";
+		$this->propal->dir_output = $rootfordata."/propale";
+		$this->propal->dir_temp = $rootfordata."/propale/temp";
 
 		// For bank storage
 		$this->bank->multidir_output = array($this->entity => $rootfordata."/bank");
@@ -361,107 +361,107 @@ class Conf
 		$this->bank->dir_temp = $rootfordata."/bank/temp";
 
 		// For medias storage
-		$this->medias->multidir_output	= array($this->entity => $rootfordata."/medias");
-		$this->medias->multidir_temp	= array($this->entity => $rootfordata."/medias/temp");
+		$this->medias->multidir_output = array($this->entity => $rootfordata."/medias");
+		$this->medias->multidir_temp = array($this->entity => $rootfordata."/medias/temp");
 
 		// Exception: Some dir are not the name of module. So we keep exception here for backward compatibility.
 
 		// Sous module bons d'expedition
-		$this->expedition_bon->enabled=(! empty($this->global->MAIN_SUBMODULE_EXPEDITION)?$this->global->MAIN_SUBMODULE_EXPEDITION:0);
+		$this->expedition_bon->enabled = (!empty($this->global->MAIN_SUBMODULE_EXPEDITION) ? $this->global->MAIN_SUBMODULE_EXPEDITION : 0);
 		// Sous module bons de livraison
-		$this->livraison_bon->enabled=(! empty($this->global->MAIN_SUBMODULE_LIVRAISON)?$this->global->MAIN_SUBMODULE_LIVRAISON:0);
+		$this->livraison_bon->enabled = (!empty($this->global->MAIN_SUBMODULE_LIVRAISON) ? $this->global->MAIN_SUBMODULE_LIVRAISON : 0);
 
 		// Module fournisseur
 		// TODO To split into module supplier_invoice and supplier_order
-		if (! empty($this->fournisseur))
+		if (!empty($this->fournisseur))
 		{
-			$this->fournisseur->commande=new stdClass();
-			$this->fournisseur->commande->multidir_output=array($this->entity => $rootfordata."/fournisseur/commande");
-			$this->fournisseur->commande->multidir_temp  =array($this->entity => $rootfordata."/fournisseur/commande/temp");
-			$this->fournisseur->commande->dir_output=$rootfordata."/fournisseur/commande";		// For backward compatibility
-			$this->fournisseur->commande->dir_temp  =$rootfordata."/fournisseur/commande/temp";	// For backward compatibility
-			$this->fournisseur->facture=new stdClass();
-			$this->fournisseur->facture->multidir_output=array($this->entity => $rootfordata."/fournisseur/facture");
-			$this->fournisseur->facture->multidir_temp  =array($this->entity => $rootfordata."/fournisseur/facture/temp");
-			$this->fournisseur->facture->dir_output =$rootfordata."/fournisseur/facture";		// For backward compatibility
-			$this->fournisseur->facture->dir_temp   =$rootfordata."/fournisseur/facture/temp";	// For backward compatibility
+			$this->fournisseur->commande = new stdClass();
+			$this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
+			$this->fournisseur->commande->multidir_temp  = array($this->entity => $rootfordata."/fournisseur/commande/temp");
+			$this->fournisseur->commande->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility
+			$this->fournisseur->commande->dir_temp  = $rootfordata."/fournisseur/commande/temp"; // For backward compatibility
+			$this->fournisseur->facture = new stdClass();
+			$this->fournisseur->facture->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");
+			$this->fournisseur->facture->multidir_temp  = array($this->entity => $rootfordata."/fournisseur/facture/temp");
+			$this->fournisseur->facture->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility
+			$this->fournisseur->facture->dir_temp   = $rootfordata."/fournisseur/facture/temp"; // For backward compatibility
 
-			$this->fournisseur->payment=new stdClass();
-			$this->fournisseur->payment->multidir_output=array($this->entity => $rootfordata."/fournisseur/payment");
-			$this->fournisseur->payment->multidir_temp  =array($this->entity => $rootfordata."/fournisseur/payment/temp");
-			$this->fournisseur->payment->dir_output =$rootfordata."/fournisseur/payment";		// For backward compatibility
-			$this->fournisseur->payment->dir_temp   =$rootfordata."/fournisseur/payment/temp";	// For backward compatibility
+			$this->fournisseur->payment = new stdClass();
+			$this->fournisseur->payment->multidir_output = array($this->entity => $rootfordata."/fournisseur/payment");
+			$this->fournisseur->payment->multidir_temp  = array($this->entity => $rootfordata."/fournisseur/payment/temp");
+			$this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility
+			$this->fournisseur->payment->dir_temp   = $rootfordata."/fournisseur/payment/temp"; // For backward compatibility
 
 			// To prepare split of module vendor(fournisseur) into vendor + supplier_order + supplier_invoice + supplierproposal
-			if (! empty($this->fournisseur->enabled))  // By default, if module supplier is on, we set new properties
+			if (!empty($this->fournisseur->enabled))  // By default, if module supplier is on, we set new properties
 			{
 				if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))	// This can be set to 1 once modules purchase order and supplier invoice exists
 				{
-	    			$this->supplier_order=new stdClass();
-	    			$this->supplier_order->enabled=1;
-	    			$this->supplier_order->multidir_output=array($this->entity => $rootfordata."/fournisseur/commande");
-	    			$this->supplier_order->multidir_temp  =array($this->entity => $rootfordata."/fournisseur/commande/temp");
-	    			$this->supplier_order->dir_output=$rootfordata."/fournisseur/commande";			// For backward compatibility
-	    			$this->supplier_order->dir_temp=$rootfordata."/fournisseur/commande/temp";		// For backward compatibility
+	    			$this->supplier_order = new stdClass();
+	    			$this->supplier_order->enabled = 1;
+	    			$this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
+	    			$this->supplier_order->multidir_temp  = array($this->entity => $rootfordata."/fournisseur/commande/temp");
+	    			$this->supplier_order->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility
+	    			$this->supplier_order->dir_temp = $rootfordata."/fournisseur/commande/temp"; // For backward compatibility
 				}
 
 				if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))	// This can be set to 1 once modules purchase order and supplier invoice exists
 				{
-					$this->supplier_invoice=new stdClass();
-	    			$this->supplier_invoice->enabled=1;
-	    			$this->supplier_invoice->multidir_output=array($this->entity => $rootfordata."/fournisseur/facture");
-	    			$this->supplier_invoice->multidir_temp  =array($this->entity => $rootfordata."/fournisseur/facture/temp");
-	    			$this->supplier_invoice->dir_output=$rootfordata."/fournisseur/facture";		// For backward compatibility
-	    			$this->supplier_invoice->dir_temp=$rootfordata."/fournisseur/facture/temp";		// For backward compatibility
+					$this->supplier_invoice = new stdClass();
+	    			$this->supplier_invoice->enabled = 1;
+	    			$this->supplier_invoice->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");
+	    			$this->supplier_invoice->multidir_temp  = array($this->entity => $rootfordata."/fournisseur/facture/temp");
+	    			$this->supplier_invoice->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility
+	    			$this->supplier_invoice->dir_temp = $rootfordata."/fournisseur/facture/temp"; // For backward compatibility
 				}
 			}
 		}
 
 		// Module product/service
-		$this->product->multidir_output=array($this->entity => $rootfordata."/produit");
-		$this->product->multidir_temp  =array($this->entity => $rootfordata."/produit/temp");
-		$this->service->multidir_output=array($this->entity => $rootfordata."/produit");
-		$this->service->multidir_temp  =array($this->entity => $rootfordata."/produit/temp");
+		$this->product->multidir_output = array($this->entity => $rootfordata."/produit");
+		$this->product->multidir_temp  = array($this->entity => $rootfordata."/produit/temp");
+		$this->service->multidir_output = array($this->entity => $rootfordata."/produit");
+		$this->service->multidir_temp  = array($this->entity => $rootfordata."/produit/temp");
 		// For backward compatibility
-		$this->product->dir_output=$rootfordata."/produit";
-		$this->product->dir_temp  =$rootfordata."/produit/temp";
-		$this->service->dir_output=$rootfordata."/produit";
-		$this->service->dir_temp  =$rootfordata."/produit/temp";
+		$this->product->dir_output = $rootfordata."/produit";
+		$this->product->dir_temp  = $rootfordata."/produit/temp";
+		$this->service->dir_output = $rootfordata."/produit";
+		$this->service->dir_temp  = $rootfordata."/produit/temp";
 
 		// Module productbatch
-		$this->productbatch->multidir_output=array($this->entity => $rootfordata."/produitlot");
-		$this->productbatch->multidir_temp  =array($this->entity => $rootfordata."/produitlot/temp");
+		$this->productbatch->multidir_output = array($this->entity => $rootfordata."/produitlot");
+		$this->productbatch->multidir_temp  = array($this->entity => $rootfordata."/produitlot/temp");
 
 		// Module contrat
-		$this->contrat->multidir_output	= array($this->entity => $rootfordata."/contract");
-		$this->contrat->multidir_temp	= array($this->entity => $rootfordata."/contract/temp");
+		$this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");
+		$this->contrat->multidir_temp = array($this->entity => $rootfordata."/contract/temp");
 		// For backward compatibility
-		$this->contrat->dir_output=$rootfordata."/contract";
-		$this->contrat->dir_temp  =$rootfordata."/contract/temp";
+		$this->contrat->dir_output = $rootfordata."/contract";
+		$this->contrat->dir_temp  = $rootfordata."/contract/temp";
 
 		// Module bank
-		$this->bank->dir_output=$rootfordata."/bank";
-		$this->bank->dir_temp  =$rootfordata."/bank/temp";
+		$this->bank->dir_output = $rootfordata."/bank";
+		$this->bank->dir_temp  = $rootfordata."/bank/temp";
 
 
 		// Set some default values
 		//$this->global->MAIN_LIST_FILTER_ON_DAY=1;		// On filter that show date, we must show input field for day before or after month
-        $this->global->MAIN_MAIL_USE_MULTI_PART=1;
+        $this->global->MAIN_MAIL_USE_MULTI_PART = 1;
 
 		// societe
-		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))		$this->global->SOCIETE_CODECLIENT_ADDON="mod_codeclient_leopard";
-		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))		$this->global->SOCIETE_CODECOMPTA_ADDON="mod_codecompta_panicum";
+		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))		$this->global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";
+		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))		$this->global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";
 
-		if (empty($this->global->CHEQUERECEIPTS_ADDON))			$this->global->CHEQUERECEIPTS_ADDON='mod_chequereceipt_mint';
-		if (empty($conf->global->TICKET_ADDON))				    $this->global->TICKET_ADDON='mod_ticket_simple';
+		if (empty($this->global->CHEQUERECEIPTS_ADDON))			$this->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
+		if (empty($conf->global->TICKET_ADDON))				    $this->global->TICKET_ADDON = 'mod_ticket_simple';
 
         // Security
-		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED='standard'; // Default password generator
-        if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK='0664';         // Default mask
+		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator
+        if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK = '0664'; // Default mask
 
 		// conf->use_javascript_ajax
-		$this->use_javascript_ajax=1;
-		if (isset($this->global->MAIN_DISABLE_JAVASCRIPT)) $this->use_javascript_ajax=! $this->global->MAIN_DISABLE_JAVASCRIPT;
+		$this->use_javascript_ajax = 1;
+		if (isset($this->global->MAIN_DISABLE_JAVASCRIPT)) $this->use_javascript_ajax = !$this->global->MAIN_DISABLE_JAVASCRIPT;
 		// If no javascript_ajax, Ajax features are disabled.
 		if (empty($this->use_javascript_ajax))
 		{
@@ -471,231 +471,231 @@ class Conf
 			unset($this->global->PROJECT_USE_SEARCH_TO_SELECT);
 		}
 
-		if (! empty($this->productbatch->enabled))
+		if (!empty($this->productbatch->enabled))
 		{
-			$this->global->STOCK_CALCULATE_ON_BILL=0;
-			$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER=0;
-			$this->global->STOCK_CALCULATE_ON_SHIPMENT=1;
-			$this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE=0;
-			$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL=0;
-			$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER=0;
-			if(empty($this->reception->enabled))$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER=1;
+			$this->global->STOCK_CALCULATE_ON_BILL = 0;
+			$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER = 0;
+			$this->global->STOCK_CALCULATE_ON_SHIPMENT = 1;
+			$this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 0;
+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;
+			$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;
+			if (empty($this->reception->enabled))$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
 			else {
-				$this->global->STOCK_CALCULATE_ON_RECEPTION=1;
-				$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE=0;
+				$this->global->STOCK_CALCULATE_ON_RECEPTION = 1;
+				$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 0;
 			}
 		}
 
 		// conf->currency
-		if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE='EUR';
-		$this->currency=$this->global->MAIN_MONNAIE;
+		if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE = 'EUR';
+		$this->currency = $this->global->MAIN_MONNAIE;
 
-		if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30;   // Less than 1 minutes to be sure
+		if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure
 
 		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
-        if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE='RECETTES-DEPENSES';  // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
+        if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
 
         // By default, suppliers objects can be linked to all projects
-        if (! isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) $this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
+        if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) $this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
 
         // By default we enable feature to bill time spent
-        if (! isset($this->global->PROJECT_BILL_TIME_SPENT)) $this->global->PROJECT_BILL_TIME_SPENT = 1;
+        if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) $this->global->PROJECT_BILL_TIME_SPENT = 1;
 
         // MAIN_HTML_TITLE
-        if (! isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE='noapp,thirdpartynameonly,contactnameonly,projectnameonly';
+        if (!isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
 
 		// conf->liste_limit = constante de taille maximale des listes
-		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25;
-		$this->liste_limit=$this->global->MAIN_SIZE_LISTE_LIMIT;
+		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT = 25;
+		$this->liste_limit = $this->global->MAIN_SIZE_LISTE_LIMIT;
 
 		// conf->product->limit_size = constante de taille maximale des select de produit
-		if (! isset($this->global->PRODUIT_LIMIT_SIZE)) $this->global->PRODUIT_LIMIT_SIZE=1000;
-		$this->product->limit_size=$this->global->PRODUIT_LIMIT_SIZE;
+		if (!isset($this->global->PRODUIT_LIMIT_SIZE)) $this->global->PRODUIT_LIMIT_SIZE = 1000;
+		$this->product->limit_size = $this->global->PRODUIT_LIMIT_SIZE;
 
 		// conf->theme et $this->css
-		if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME="eldy";
-        if (! empty($this->global->MAIN_FORCETHEME)) $this->global->MAIN_THEME=$this->global->MAIN_FORCETHEME;
-		$this->theme=$this->global->MAIN_THEME;
+		if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME = "eldy";
+        if (!empty($this->global->MAIN_FORCETHEME)) $this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;
+		$this->theme = $this->global->MAIN_THEME;
 		$this->css  = "/theme/".$this->theme."/style.css.php";
 
 		// conf->email_from = email pour envoi par dolibarr des mails automatiques
 		$this->email_from = "robot@example.com";
-		if (! empty($this->global->MAIN_MAIL_EMAIL_FROM)) $this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM;
+		if (!empty($this->global->MAIN_MAIL_EMAIL_FROM)) $this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM;
 
 		// conf->notification->email_from = email pour envoi par Dolibarr des notifications
-		$this->notification->email_from=$this->email_from;
-		if (! empty($this->global->NOTIFICATION_EMAIL_FROM)) $this->notification->email_from=$this->global->NOTIFICATION_EMAIL_FROM;
+		$this->notification->email_from = $this->email_from;
+		if (!empty($this->global->NOTIFICATION_EMAIL_FROM)) $this->notification->email_from = $this->global->NOTIFICATION_EMAIL_FROM;
 
 		// conf->mailing->email_from = email pour envoi par Dolibarr des mailings
-		$this->mailing->email_from=$this->email_from;
-		if (! empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from=$this->global->MAILING_EMAIL_FROM;
-		if (! isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID=1;
+		$this->mailing->email_from = $this->email_from;
+		if (!empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
+		if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
 
         // Format for date (used by default when not found or not searched in lang)
-        $this->format_date_short="%d/%m/%Y";            // Format of day with PHP/C tags (strftime functions)
-        $this->format_date_short_java="dd/MM/yyyy";     // Format of day with Java tags
-        $this->format_hour_short="%H:%M";
-        $this->format_hour_short_duration="%H:%M";
-        $this->format_date_text_short="%d %b %Y";
-        $this->format_date_text="%d %B %Y";
-        $this->format_date_hour_short="%d/%m/%Y %H:%M";
-        $this->format_date_hour_sec_short="%d/%m/%Y %H:%M:%S";
-        $this->format_date_hour_text_short="%d %b %Y %H:%M";
-        $this->format_date_hour_text="%d %B %Y %H:%M";
+        $this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
+        $this->format_date_short_java = "dd/MM/yyyy"; // Format of day with Java tags
+        $this->format_hour_short = "%H:%M";
+        $this->format_hour_short_duration = "%H:%M";
+        $this->format_date_text_short = "%d %b %Y";
+        $this->format_date_text = "%d %B %Y";
+        $this->format_date_hour_short = "%d/%m/%Y %H:%M";
+        $this->format_date_hour_sec_short = "%d/%m/%Y %H:%M:%S";
+        $this->format_date_hour_text_short = "%d %b %Y %H:%M";
+        $this->format_date_hour_text = "%d %B %Y %H:%M";
 
         // Duration of workday
-        if (! isset($this->global->MAIN_DURATION_OF_WORKDAY)) $this->global->MAIN_DURATION_OF_WORKDAY=86400;
+        if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) $this->global->MAIN_DURATION_OF_WORKDAY = 86400;
 
 		// Limites decimales si non definie (peuvent etre egale a 0)
-		if (! isset($this->global->MAIN_MAX_DECIMALS_UNIT))  $this->global->MAIN_MAX_DECIMALS_UNIT=5;
-		if (! isset($this->global->MAIN_MAX_DECIMALS_TOT))   $this->global->MAIN_MAX_DECIMALS_TOT=2;
-		if (! isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) $this->global->MAIN_MAX_DECIMALS_SHOWN=8;
+		if (!isset($this->global->MAIN_MAX_DECIMALS_UNIT))  $this->global->MAIN_MAX_DECIMALS_UNIT = 5;
+		if (!isset($this->global->MAIN_MAX_DECIMALS_TOT))   $this->global->MAIN_MAX_DECIMALS_TOT = 2;
+		if (!isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) $this->global->MAIN_MAX_DECIMALS_SHOWN = 8;
 
 		// Default pdf option
-		if (! isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) $this->global->MAIN_PDF_DASH_BETWEEN_LINES=1;    // use dash between lines
-		if (! isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) $this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT=1;  // allow html content into free footer text
+		if (!isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) $this->global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines
+		if (!isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) $this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text
 
 		// Default max file size for upload
 		$this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : (int) $this->global->MAIN_UPLOAD_DOC * 1024);
 
 		// By default, we propagate contacts
-		if (! isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) $this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN='*';  // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)
+		if (!isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) $this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*'; // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)
 
 		// By default, we do not use the zip town table but the table of third parties
-		if (! isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) $this->global->MAIN_USE_ZIPTOWN_DICTIONNARY=0;
+		if (!isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) $this->global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;
 
 		// By default, we open card if one found
-		if (! isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) $this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE=1;
+		if (!isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) $this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;
 
 		// By default, we show state code in combo list
-		if (! isset($this->global->MAIN_SHOW_STATE_CODE)) $this->global->MAIN_SHOW_STATE_CODE=1;
+		if (!isset($this->global->MAIN_SHOW_STATE_CODE)) $this->global->MAIN_SHOW_STATE_CODE = 1;
 
 		// Use a SCA ready workflow with Stripe module (STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION by default if nothing defined)
-		if (! isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) $this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION=1;
+		if (!isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) $this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1;
 
 		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
-		if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog';	// '' means 'all'. Note that contact is added here as it should be a module later.
-		if (! empty($this->modules_parts['moduleforexternal']))		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
+		if (!isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.
+		if (!empty($this->modules_parts['moduleforexternal']))		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
 		{
-			foreach($this->modules_parts['moduleforexternal'] as $key=>$value) $this->global->MAIN_MODULES_FOR_EXTERNAL.=",".$key;
+			foreach ($this->modules_parts['moduleforexternal'] as $key=>$value) $this->global->MAIN_MODULES_FOR_EXTERNAL .= ",".$key;
 		}
 
 		// Enable select2
-		if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT='select2';
+		if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT = 'select2';
 
 		// Timeouts
-        if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT=10;
-        if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT=30;
+        if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT = 10;
+        if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;
 
 		// Set default variable to calculate VAT as if option tax_mode was 0 (standard)
-        if (empty($this->global->TAX_MODE_SELL_PRODUCT)) $this->global->TAX_MODE_SELL_PRODUCT='invoice';
-        if (empty($this->global->TAX_MODE_BUY_PRODUCT))  $this->global->TAX_MODE_BUY_PRODUCT='invoice';
-        if (empty($this->global->TAX_MODE_SELL_SERVICE)) $this->global->TAX_MODE_SELL_SERVICE='payment';
-        if (empty($this->global->TAX_MODE_BUY_SERVICE))  $this->global->TAX_MODE_BUY_SERVICE='payment';
+        if (empty($this->global->TAX_MODE_SELL_PRODUCT)) $this->global->TAX_MODE_SELL_PRODUCT = 'invoice';
+        if (empty($this->global->TAX_MODE_BUY_PRODUCT))  $this->global->TAX_MODE_BUY_PRODUCT = 'invoice';
+        if (empty($this->global->TAX_MODE_SELL_SERVICE)) $this->global->TAX_MODE_SELL_SERVICE = 'payment';
+        if (empty($this->global->TAX_MODE_BUY_SERVICE))  $this->global->TAX_MODE_BUY_SERVICE = 'payment';
 
 		// Delay before warnings
 		// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx
 		if (isset($this->agenda)) {
 		    $this->adherent->subscription = new stdClass();
-            $this->adherent->subscription->warning_delay=(isset($this->global->MAIN_DELAY_MEMBERS)?$this->global->MAIN_DELAY_MEMBERS:0)*24*60*60;
+            $this->adherent->subscription->warning_delay = (isset($this->global->MAIN_DELAY_MEMBERS) ? $this->global->MAIN_DELAY_MEMBERS : 0) * 24 * 60 * 60;
 		}
 		if (isset($this->agenda)) {
-            $this->agenda->warning_delay=(isset($this->global->MAIN_DELAY_ACTIONS_TODO)?$this->global->MAIN_DELAY_ACTIONS_TODO:7)*24*60*60;
+            $this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 24 * 60 * 60;
         }
 		if (isset($this->projet))
 		{
-		    $this->projet->warning_delay=(isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE)?$this->global->MAIN_DELAY_PROJECT_TO_CLOSE:7)*24*60*60;
-		    $this->projet->task                 = new StdClass();
-		    $this->projet->task->warning_delay=(isset($this->global->MAIN_DELAY_TASKS_TODO)?$this->global->MAIN_DELAY_TASKS_TODO:7)*24*60*60;
+		    $this->projet->warning_delay = (isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE) ? $this->global->MAIN_DELAY_PROJECT_TO_CLOSE : 7) * 24 * 60 * 60;
+		    $this->projet->task = new StdClass();
+		    $this->projet->task->warning_delay = (isset($this->global->MAIN_DELAY_TASKS_TODO) ? $this->global->MAIN_DELAY_TASKS_TODO : 7) * 24 * 60 * 60;
 		}
 
         if (isset($this->commande)) {
-            $this->commande->client				= new stdClass();
-    		$this->commande->fournisseur		= new stdClass();
-    		$this->commande->client->warning_delay=(isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS)?$this->global->MAIN_DELAY_ORDERS_TO_PROCESS:2)*24*60*60;
-    		$this->commande->fournisseur->warning_delay=(isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS)?$this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS:7)*24*60*60;
+            $this->commande->client = new stdClass();
+    		$this->commande->fournisseur = new stdClass();
+    		$this->commande->client->warning_delay = (isset($this->global->MAIN_DELAY_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_ORDERS_TO_PROCESS : 2) * 24 * 60 * 60;
+    		$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 24 * 60 * 60;
 		}
 		if (isset($this->propal)) {
-		    $this->propal->cloture				= new stdClass();
-    		$this->propal->facturation			= new stdClass();
-	        $this->propal->cloture->warning_delay=(isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE)?$this->global->MAIN_DELAY_PROPALS_TO_CLOSE:0)*24*60*60;
-            $this->propal->facturation->warning_delay=(isset($this->global->MAIN_DELAY_PROPALS_TO_BILL)?$this->global->MAIN_DELAY_PROPALS_TO_BILL:0)*24*60*60;
+		    $this->propal->cloture = new stdClass();
+    		$this->propal->facturation = new stdClass();
+	        $this->propal->cloture->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_CLOSE) ? $this->global->MAIN_DELAY_PROPALS_TO_CLOSE : 0) * 24 * 60 * 60;
+            $this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 24 * 60 * 60;
 		}
 		if (isset($this->facture)) {
-		    $this->facture->client				= new stdClass();
-    		$this->facture->fournisseur			= new stdClass();
-            $this->facture->client->warning_delay=(isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED)?$this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED:0)*24*60*60;
-		    $this->facture->fournisseur->warning_delay=(isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY)?$this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY:0)*24*60*60;
+		    $this->facture->client = new stdClass();
+    		$this->facture->fournisseur = new stdClass();
+            $this->facture->client->warning_delay = (isset($this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED) ? $this->global->MAIN_DELAY_CUSTOMER_BILLS_UNPAYED : 0) * 24 * 60 * 60;
+		    $this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 24 * 60 * 60;
 		}
 		if (isset($this->contrat)) {
-		    $this->contrat->services			= new stdClass();
-    		$this->contrat->services->inactifs	= new stdClass();
-	   	    $this->contrat->services->expires	= new stdClass();
-		    $this->contrat->services->inactifs->warning_delay=(isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES)?$this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES:0)*24*60*60;
-            $this->contrat->services->expires->warning_delay=(isset($this->global->MAIN_DELAY_RUNNING_SERVICES)?$this->global->MAIN_DELAY_RUNNING_SERVICES:0)*24*60*60;
+		    $this->contrat->services = new stdClass();
+    		$this->contrat->services->inactifs = new stdClass();
+	   	    $this->contrat->services->expires = new stdClass();
+		    $this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 24 * 60 * 60;
+            $this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 24 * 60 * 60;
 		}
 		if (isset($this->commande)) {
 		    $this->bank->rappro					= new stdClass();
     		$this->bank->cheque					= new stdClass();
-            $this->bank->rappro->warning_delay=(isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE)?$this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE:0)*24*60*60;
-		    $this->bank->cheque->warning_delay=(isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT)?$this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT:0)*24*60*60;
+            $this->bank->rappro->warning_delay = (isset($this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE) ? $this->global->MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE : 0) * 24 * 60 * 60;
+		    $this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 24 * 60 * 60;
 		}
 		if (isset($this->expensereport)) {
 		    $this->expensereport->approve = new stdClass();
-		    $this->expensereport->approve->warning_delay=(isset($this->global->MAIN_DELAY_EXPENSEREPORTS)?$this->global->MAIN_DELAY_EXPENSEREPORTS:0)*24*60*60;
+		    $this->expensereport->approve->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS) ? $this->global->MAIN_DELAY_EXPENSEREPORTS : 0) * 24 * 60 * 60;
 		    $this->expensereport->payment = new stdClass();
-		    $this->expensereport->payment->warning_delay=(isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY)?$this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY:0)*24*60*60;
+		    $this->expensereport->payment->warning_delay = (isset($this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY) ? $this->global->MAIN_DELAY_EXPENSEREPORTS_TO_PAY : 0) * 24 * 60 * 60;
 		}
         if (isset($this->holiday)) {
             $this->holiday->approve = new stdClass();
-            $this->holiday->approve->warning_delay=(isset($this->global->MAIN_DELAY_HOLIDAYS)?$this->global->MAIN_DELAY_HOLIDAYS:0)*24*60*60;
+            $this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? $this->global->MAIN_DELAY_HOLIDAYS : 0) * 24 * 60 * 60;
         }
 
-		if (! empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))
+		if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))
 		{
 		    $this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 		}
 
 		// For modules that want to disable top or left menu
-		if (! empty($this->global->MAIN_HIDE_TOP_MENU)) $this->dol_hide_topmenu=$this->global->MAIN_HIDE_TOP_MENU;
-		if (! empty($this->global->MAIN_HIDE_LEFT_MENU)) $this->dol_hide_leftmenu=$this->global->MAIN_HIDE_LEFT_MENU;
+		if (!empty($this->global->MAIN_HIDE_TOP_MENU)) $this->dol_hide_topmenu = $this->global->MAIN_HIDE_TOP_MENU;
+		if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) $this->dol_hide_leftmenu = $this->global->MAIN_HIDE_LEFT_MENU;
 
-		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) $this->global->MAIN_SIZE_SHORTLIST_LIMIT=3;
+		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) $this->global->MAIN_SIZE_SHORTLIST_LIMIT = 3;
 
-		if (! isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) $this->global->THEME_HIDE_BORDER_ON_INPUT=0;
+		if (!isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) $this->global->THEME_HIDE_BORDER_ON_INPUT = 0;
 
 		// Save inconsistent option
-		if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (! isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO'))
+		if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (!isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO'))
 		{
-			$this->global->AGENDA_DEFAULT_FILTER_TYPE='0';    // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
+			$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
 		}
 
-		if (! isset($this->global->MAIN_EXTRAFIELDS_IN_ONE_TD)) $this->global->MAIN_EXTRAFIELDS_IN_ONE_TD = 1;
+		if (!isset($this->global->MAIN_EXTRAFIELDS_IN_ONE_TD)) $this->global->MAIN_EXTRAFIELDS_IN_ONE_TD = 1;
 
-		if (! isset($this->global->MAIN_USE_OLD_TITLE_BUTTON)) $this->global->MAIN_USE_OLD_TITLE_BUTTON = 0;
+		if (!isset($this->global->MAIN_USE_OLD_TITLE_BUTTON)) $this->global->MAIN_USE_OLD_TITLE_BUTTON = 0;
 
-		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV='https://www.dolistore.com';
-		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) $this->global->MAIN_MODULE_DOLISTORE_API_KEY='dolistorecatalogpublickey1234567';
+		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
+		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) $this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';
 
 		// If we are in develop mode, we activate the option MAIN_SECURITY_CSRF_WITH_TOKEN to 1 if not already defined.
-		if (! isset($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $conf->global->MAIN_FEATURES_LEVEL >= 2) $conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;
+		if (!isset($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $conf->global->MAIN_FEATURES_LEVEL >= 2) $conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;
 
 		// For backward compatibility
-		if (isset($this->product))   $this->produit=$this->product;
-		if (isset($this->facture))   $this->invoice=$this->facture;
-		if (isset($this->commande))  $this->order=$this->commande;
-		if (isset($this->contrat))   $this->contract=$this->contrat;
-		if (isset($this->categorie)) $this->category=$this->categorie;
-		if (isset($this->project))   $this->project=$this->projet;
+		if (isset($this->product))   $this->produit = $this->product;
+		if (isset($this->facture))   $this->invoice = $this->facture;
+		if (isset($this->commande))  $this->order = $this->commande;
+		if (isset($this->contrat))   $this->contract = $this->contrat;
+		if (isset($this->categorie)) $this->category = $this->categorie;
+		if (isset($this->project))   $this->project = $this->projet;
 
         // Object $mc
-        if (! defined('NOREQUIREMC') && ! empty($this->multicompany->enabled))
+        if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled))
         {
         	if (is_object($mc)) $mc->setValues($this);
         }
 
 		// We init log handlers
-		if (! empty($this->global->SYSLOG_HANDLERS)) {
+		if (!empty($this->global->SYSLOG_HANDLERS)) {
 			$handlers = json_decode($this->global->SYSLOG_HANDLERS);
 		} else {
 			$handlers = array();
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index b65d72332e0..41a0d485ce0 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -56,19 +56,28 @@ class EmailSenderProfile extends CommonObject
 	public $picto = 'emailsenderprofile@monmodule';
 
 
+	const STATUS_DISABLED = 0;
+	const STATUS_ENABLED = 1;
+
+
 	/**
-	 *             'type' if the field format.
-	 *             'label' the translation key.
-	 *             'enabled' is a condition when the filed must be managed.
-	 *             'visible' says if field is visible in list (-1 means not shown by default but can be added into list to be viewed).
-	 *             'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-	 *             'index' if we want an index in database.
-	 *             'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *             'position' is the sort order of field.
-	 *             'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-	 *             'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *             'help' is a string visible as a tooltip on field
-	 *             'comment' is not used. You can store here any text of your choice.
+	 *  'type' if the field format ('integer', 'integer:Class:pathtoclass', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float')
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed.
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'position' is the sort order of field.
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
@@ -78,7 +87,7 @@ class EmailSenderProfile extends CommonObject
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>1),
 		'email' => array('type'=>'varchar(255)', 'label'=>'Email', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1),
 		//'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
 		//'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
@@ -86,7 +95,7 @@ class EmailSenderProfile extends CommonObject
 		'position' => array('type'=>'integer', 'label'=>'Position', 'visible'=>1, 'enabled'=>1, 'position'=>405, 'notnull'=>-1, 'index'=>1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1),
+		'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'default'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1),
 	);
 
 	/**
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 81dffc51b67..889a38efddb 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1957,13 +1957,14 @@ class ExtraFields
 	 *
 	 * @param   string	$key            Key of attribute
 	 * @param	string	$object			Object
+	 * @param	int		$colspan		Value of colspan to use (it must includes the first column with title)
 	 * @return 	string					HTML code with line for separator
 	 */
-	public function showSeparator($key, $object)
+	public function showSeparator($key, $object, $colspan = 2)
 	{
 		global $langs;
 
-		$out = '<tr id="trextrafieldseparator'.$key.'" class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
+		$out = '<tr id="trextrafieldseparator'.$key.'" class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="'.$colspan.'"><strong>';
 		$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
 		$out .= '</strong></td></tr>';
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index b85ed6c5a3b..d70993be51d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5749,14 +5749,14 @@ class Form
     /**
      *  Function to show a form to select a duration on a page
 	 *
-	 *	@param	string	$prefix   		Prefix for input fields
-	 *	@param  int	$iSecond  		    Default preselected duration (number of seconds or '')
-	 * 	@param	int	$disabled           Disable the combo box
-	 * 	@param	string	$typehour		If 'select' then input hour and input min is a combo,
-	 *						            if 'text' input hour is in text and input min is a text,
-	 *						            if 'textselect' input hour is in text and input min is a combo
-	 *  @param	integer	$minunderhours	If 1, show minutes selection under the hours
-	 * 	@param	int	$nooutput		    Do not output html string but return it
+	 *	@param	string		$prefix   		Prefix for input fields
+	 *	@param  int			$iSecond  		Default preselected duration (number of seconds or '')
+	 * 	@param	int			$disabled       Disable the combo box
+	 * 	@param	string		$typehour		If 'select' then input hour and input min is a combo,
+	 *						            	If 'text' input hour is in text and input min is a text,
+	 *						            	If 'textselect' input hour is in text and input min is a combo
+	 *  @param	integer		$minunderhours	If 1, show minutes selection under the hours
+	 * 	@param	int			$nooutput		Do not output html string but return it
 	 *  @return	string|void
 	 */
     public function select_duration($prefix, $iSecond = '', $disabled = 0, $typehour = 'select', $minunderhours = 0, $nooutput = 0)
@@ -6521,6 +6521,7 @@ class Form
 			elseif ($addjscombo == 2)
 			{
 				// Add other js lib
+				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
 				// ...
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').multiSelect({
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 7aab9bd6774..6cd88175a67 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -56,19 +56,19 @@ class FormWebsite
      */
     public function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
     {
-        $out='';
+        $out = '';
 
         $sql = "SELECT rowid, ref";
-        $sql.= " FROM ".MAIN_DB_PREFIX."website";
-        $sql.= " WHERE 1 = 1";
-        $sql.= " ORDER BY rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."website";
+        $sql .= " WHERE 1 = 1";
+        $sql .= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
         {
-            $out.='<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
+            $out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
             if ($useempty)
             {
-                $out.='<option value="-1">&nbsp;</option>';
+                $out .= '<option value="-1">&nbsp;</option>';
             }
 
             $num = $this->db->num_rows($result);
@@ -78,17 +78,17 @@ class FormWebsite
                 $obj = $this->db->fetch_object($result);
                 if ($selected == $obj->rowid)
                 {
-                    $out.='<option value="'.$obj->rowid.'" selected>';
+                    $out .= '<option value="'.$obj->rowid.'" selected>';
                 }
                 else
                 {
-                    $out.='<option value="'.$obj->rowid.'">';
+                    $out .= '<option value="'.$obj->rowid.'">';
                 }
-                $out.=$obj->ref;
-                $out.='</option>';
+                $out .= $obj->ref;
+                $out .= '</option>';
                 $i++;
             }
-            $out.="</select>";
+            $out .= "</select>";
         }
         else {
             dol_print_error($this->db);
@@ -114,9 +114,9 @@ class FormWebsite
         $langs->load("admin");
 
         $sql = "SELECT rowid, code, label, entity";
-        $sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-        $sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-        $sql.= " ORDER BY label";
+        $sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+        $sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+        $sql .= " ORDER BY label";
 
     	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
     	$result = $this->db->query($sql);
@@ -126,7 +126,7 @@ class FormWebsite
     		$i = 0;
     		if ($num)
     		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
     			if ($useempty == 1 || ($useempty == 2 && $num > 1))
     			{
     				print '<option value="-1">&nbsp;</option>';
@@ -179,8 +179,8 @@ class FormWebsite
     	$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');
 
     	$arrayofsamples = array();
-    	$arrayofsamples['empty']='EmptyPage';	// Always this one first
-    	foreach($listofsamples as $sample)
+    	$arrayofsamples['empty'] = 'EmptyPage'; // Always this one first
+    	foreach ($listofsamples as $sample)
     	{
     		$reg = array();
     		if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
@@ -193,14 +193,14 @@ class FormWebsite
     	}
 
     	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 
     	if ($useempty == 1 || $useempty == 2)
     	{
     		$out .= '<option value="-1">&nbsp;</option>';
     	}
 
-    	foreach($arrayofsamples as $key => $val)
+    	foreach ($arrayofsamples as $key => $val)
     	{
     		if ($selected == $key)
     		{
@@ -229,63 +229,66 @@ class FormWebsite
      *  @param	int			$showempty		Show empty record
      *  @param	string		$action			Action on page that use this select list
      *  @param	string		$morecss		More CSS
+     *  @param	array		$excludeids		Exclude some ID in list
      * 	@return	string						HTML select component with list of type of containers
      */
-    public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200')
+    public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '', $morecss = 'minwidth200', $excludeids = null)
     {
     	global $langs;
 
     	$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
 
-	    $out='';
+	    $out = '';
 	    if ($atleastonepage && $action != 'editsource')
 	    {
-	    	$out.='<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
+	    	$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
 	    }
 	    else
 	    {
-	    	$out.='<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
+	    	$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
 	    }
 
-	    if ($showempty || ! $atleastonepage) $out.='<option value="-1">&nbsp;</option>';
+	    if ($showempty || !$atleastonepage) $out .= '<option value="-1">&nbsp;</option>';
 
 	    if ($atleastonepage)
 	    {
 	    	if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
 	    	{
-	    		$firstpageid=0;$homepageid=0;
-	    		foreach($website->lines as $key => $valpage)
+	    		$firstpageid = 0; $homepageid = 0;
+	    		foreach ($website->lines as $key => $valpage)
 	    		{
-	    			if (empty($firstpageid)) $firstpageid=$valpage->id;
-	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid=$valpage->id;
+	    			if (empty($firstpageid)) $firstpageid = $valpage->id;
+	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid = $valpage->id;
 	    		}
-	    		$pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
+	    		$pageid = $homepageid ? $homepageid : $firstpageid; // We choose home page and if not defined yet, we take first page
 	    	}
 
-	    	foreach($website->lines as $key => $valpage)
+	    	foreach ($website->lines as $key => $valpage)
 	    	{
-	    		$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
-	    		$valueforoption.= $valpage->pageurl.' - '.$valpage->title;
-	    		if ($website->fk_default_home && $key == $website->fk_default_home) $valueforoption.=' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+	    		if (is_array($excludeids) && count($excludeids) && in_array($valpage->id, $excludeids)) continue;
 
-	    		$out.='<option value="'.$key.'"';
-	    		if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
-	    		$out.=' data-html="'.dol_escape_htmltag($valueforoption).'"';
-	    		$out.='>';
-	    		$out.=$valueforoption;
-	    		$out.='</option>';
+	    		$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
+	    		$valueforoption .= $valpage->pageurl.' - '.$valpage->title;
+	    		if ($website->fk_default_home && $key == $website->fk_default_home) $valueforoption .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+
+	    		$out .= '<option value="'.$key.'"';
+	    		if ($pageid > 0 && $pageid == $key) $out .= ' selected'; // To preselect a value
+	    		$out .= ' data-html="'.dol_escape_htmltag($valueforoption).'"';
+	    		$out .= '>';
+	    		$out .= $valueforoption;
+	    		$out .= '</option>';
 	    	}
 	    }
-	    $out.='</select>';
+	    $out .= '</select>';
 
 	    if ($atleastonepage && $action != 'editsource')
 	    {
-	    	$out.=ajax_combobox($htmlname);
+	    	$out .= ajax_combobox($htmlname);
 	    }
 	    else
 	    {
-	    	$out.='<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
-	    	$out.=ajax_combobox($htmlname);
+	    	$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
+	    	$out .= ajax_combobox($htmlname);
 	    }
 	    return $out;
 	}
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 3af8d3924a8..06e2e99397f 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -173,24 +173,24 @@ class Menubase
         global $conf, $langs;
 
         // Clean parameters
-        $this->menu_handler=trim($this->menu_handler);
-        $this->module=trim($this->module);
-        $this->type=trim($this->type);
-        $this->mainmenu=trim($this->mainmenu);
-        $this->leftmenu=trim($this->leftmenu);
-        $this->fk_menu = (int) $this->fk_menu;          // If -1, fk_mainmenu and fk_leftmenu must be defined
-        $this->fk_mainmenu=trim($this->fk_mainmenu);
-        $this->fk_leftmenu=trim($this->fk_leftmenu);
+        $this->menu_handler = trim($this->menu_handler);
+        $this->module = trim($this->module);
+        $this->type = trim($this->type);
+        $this->mainmenu = trim($this->mainmenu);
+        $this->leftmenu = trim($this->leftmenu);
+        $this->fk_menu = (int) $this->fk_menu; // If -1, fk_mainmenu and fk_leftmenu must be defined
+        $this->fk_mainmenu = trim($this->fk_mainmenu);
+        $this->fk_leftmenu = trim($this->fk_leftmenu);
         $this->position = (int) $this->position;
-        $this->url=trim($this->url);
-        $this->target=trim($this->target);
-        $this->titre=trim($this->titre);
-        $this->langs=trim($this->langs);
-        $this->perms=trim($this->perms);
-        $this->enabled=trim($this->enabled);
+        $this->url = trim($this->url);
+        $this->target = trim($this->target);
+        $this->titre = trim($this->titre);
+        $this->langs = trim($this->langs);
+        $this->perms = trim($this->perms);
+        $this->enabled = trim($this->enabled);
         $this->user = (int) $this->user;
-        if (empty($this->position)) $this->position=0;
-        if (! $this->level) $this->level=0;
+        if (empty($this->position)) $this->position = 0;
+        if (!$this->level) $this->level = 0;
 
         // Check parameters
         if (empty($this->menu_handler)) return -1;
@@ -201,32 +201,32 @@ class Menubase
         if (in_array($this->db->type, array('pgsql')))
         {
             $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
-            $resqlrowid=$this->db->query($sql);
+            $resqlrowid = $this->db->query($sql);
             if ($resqlrowid) {
-                $obj=$this->db->fetch_object($resqlrowid);
-                $maxrowid=$obj->maxrowid;
+                $obj = $this->db->fetch_object($resqlrowid);
+                $maxrowid = $obj->maxrowid;
 
                 // Max rowid can be empty if there is no record yet
-                if(empty($maxrowid)) $maxrowid=1;
+                if (empty($maxrowid)) $maxrowid = 1;
 
                 $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
                 //print $sql; exit;
-                $resqlrowidset=$this->db->query($sql);
-                if (! $resqlrowidset) dol_print_error($this->db);
+                $resqlrowidset = $this->db->query($sql);
+                if (!$resqlrowidset) dol_print_error($this->db);
             }
             else dol_print_error($this->db);
         }
 
         // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
         $sql = "SELECT count(*)";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu";
-        $sql.= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";
-        $sql.= " AND fk_menu = ".((int) $this->fk_menu);
-        $sql.= " AND position = ".((int) $this->position);
-        $sql.= " AND url = '".$this->db->escape($this->url)."'";
-        $sql.= " AND entity = ".$conf->entity;
+        $sql .= " FROM ".MAIN_DB_PREFIX."menu";
+        $sql .= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";
+        $sql .= " AND fk_menu = ".((int) $this->fk_menu);
+        $sql .= " AND position = ".((int) $this->position);
+        $sql .= " AND url = '".$this->db->escape($this->url)."'";
+        $sql .= " AND entity = ".$conf->entity;
 
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
         	$row = $this->db->fetch_row($result);
@@ -235,45 +235,45 @@ class Menubase
         	{
 		        // Insert request
 		        $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
-		        $sql.= "menu_handler,";
-		        $sql.= "entity,";
-		        $sql.= "module,";
-		        $sql.= "type,";
-		        $sql.= "mainmenu,";
-		        $sql.= "leftmenu,";
-		        $sql.= "fk_menu,";
-		        $sql.= "fk_mainmenu,";
-		        $sql.= "fk_leftmenu,";
-		        $sql.= "position,";
-		        $sql.= "url,";
-		        $sql.= "target,";
-		        $sql.= "titre,";
-		        $sql.= "langs,";
-		        $sql.= "perms,";
-		        $sql.= "enabled,";
-		        $sql.= "usertype";
-		        $sql.= ") VALUES (";
-		        $sql.= " '".$this->db->escape($this->menu_handler)."',";
-		        $sql.= " '".$this->db->escape($conf->entity)."',";
-		        $sql.= " '".$this->db->escape($this->module)."',";
-		        $sql.= " '".$this->db->escape($this->type)."',";
-		        $sql.= " ".($this->mainmenu?"'".$this->db->escape($this->mainmenu)."'":"''").",";    // Can't be null
-		        $sql.= " ".($this->leftmenu?"'".$this->db->escape($this->leftmenu)."'":"null").",";
-		        $sql.= " ".((int) $this->fk_menu).",";
-		        $sql.= " ".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
-		        $sql.= " ".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
-		        $sql.= " ".((int) $this->position).",";
-		        $sql.= " '".$this->db->escape($this->url)."',";
-		        $sql.= " '".$this->db->escape($this->target)."',";
-		        $sql.= " '".$this->db->escape($this->titre)."',";
-		        $sql.= " '".$this->db->escape($this->langs)."',";
-		        $sql.= " '".$this->db->escape($this->perms)."',";
-		        $sql.= " '".$this->db->escape($this->enabled)."',";
-		        $sql.= " '".$this->db->escape($this->user)."'";
-		        $sql.= ")";
+		        $sql .= "menu_handler,";
+		        $sql .= "entity,";
+		        $sql .= "module,";
+		        $sql .= "type,";
+		        $sql .= "mainmenu,";
+		        $sql .= "leftmenu,";
+		        $sql .= "fk_menu,";
+		        $sql .= "fk_mainmenu,";
+		        $sql .= "fk_leftmenu,";
+		        $sql .= "position,";
+		        $sql .= "url,";
+		        $sql .= "target,";
+		        $sql .= "titre,";
+		        $sql .= "langs,";
+		        $sql .= "perms,";
+		        $sql .= "enabled,";
+		        $sql .= "usertype";
+		        $sql .= ") VALUES (";
+		        $sql .= " '".$this->db->escape($this->menu_handler)."',";
+		        $sql .= " '".$this->db->escape($conf->entity)."',";
+		        $sql .= " '".$this->db->escape($this->module)."',";
+		        $sql .= " '".$this->db->escape($this->type)."',";
+		        $sql .= " ".($this->mainmenu ? "'".$this->db->escape($this->mainmenu)."'" : "''").","; // Can't be null
+		        $sql .= " ".($this->leftmenu ? "'".$this->db->escape($this->leftmenu)."'" : "null").",";
+		        $sql .= " ".((int) $this->fk_menu).",";
+		        $sql .= " ".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
+		        $sql .= " ".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
+		        $sql .= " ".((int) $this->position).",";
+		        $sql .= " '".$this->db->escape($this->url)."',";
+		        $sql .= " '".$this->db->escape($this->target)."',";
+		        $sql .= " '".$this->db->escape($this->titre)."',";
+		        $sql .= " '".$this->db->escape($this->langs)."',";
+		        $sql .= " '".$this->db->escape($this->perms)."',";
+		        $sql .= " '".$this->db->escape($this->enabled)."',";
+		        $sql .= " '".$this->db->escape($this->user)."'";
+		        $sql .= ")";
 
 		        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		        $resql=$this->db->query($sql);
+		        $resql = $this->db->query($sql);
 		        if ($resql)
 		        {
 		            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");
@@ -283,7 +283,7 @@ class Menubase
 		        }
 		        else
 		        {
-		            $this->error="Error ".$this->db->lasterror();
+		            $this->error = "Error ".$this->db->lasterror();
 		            return -1;
 		        }
         	}
@@ -312,22 +312,22 @@ class Menubase
         //global $conf, $langs;
 
         // Clean parameters
-        $this->rowid=trim($this->rowid);
-        $this->menu_handler=trim($this->menu_handler);
-        $this->module=trim($this->module);
-        $this->type=trim($this->type);
-        $this->mainmenu=trim($this->mainmenu);
-        $this->leftmenu=trim($this->leftmenu);
+        $this->rowid = trim($this->rowid);
+        $this->menu_handler = trim($this->menu_handler);
+        $this->module = trim($this->module);
+        $this->type = trim($this->type);
+        $this->mainmenu = trim($this->mainmenu);
+        $this->leftmenu = trim($this->leftmenu);
         $this->fk_menu = (int) $this->fk_menu;
-        $this->fk_mainmenu=trim($this->fk_mainmenu);
-        $this->fk_leftmenu=trim($this->fk_leftmenu);
+        $this->fk_mainmenu = trim($this->fk_mainmenu);
+        $this->fk_leftmenu = trim($this->fk_leftmenu);
         $this->position = (int) $this->position;
-        $this->url=trim($this->url);
-        $this->target=trim($this->target);
-        $this->titre=trim($this->titre);
-        $this->langs=trim($this->langs);
-        $this->perms=trim($this->perms);
-        $this->enabled=trim($this->enabled);
+        $this->url = trim($this->url);
+        $this->target = trim($this->target);
+        $this->titre = trim($this->titre);
+        $this->langs = trim($this->langs);
+        $this->perms = trim($this->perms);
+        $this->enabled = trim($this->enabled);
         $this->user = (int) $this->user;
 
         // Check parameters
@@ -335,29 +335,29 @@ class Menubase
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
-        $sql.= " menu_handler='".$this->db->escape($this->menu_handler)."',";
-        $sql.= " module='".$this->db->escape($this->module)."',";
-        $sql.= " type='".$this->db->escape($this->type)."',";
-        $sql.= " mainmenu='".$this->db->escape($this->mainmenu)."',";
-        $sql.= " leftmenu='".$this->db->escape($this->leftmenu)."',";
-        $sql.= " fk_menu=".$this->fk_menu.",";
-        $sql.= " fk_mainmenu=".($this->fk_mainmenu?"'".$this->db->escape($this->fk_mainmenu)."'":"null").",";
-        $sql.= " fk_leftmenu=".($this->fk_leftmenu?"'".$this->db->escape($this->fk_leftmenu)."'":"null").",";
-        $sql.= " position=".($this->position > 0 ? $this->position : 0).",";
-        $sql.= " url='".$this->db->escape($this->url)."',";
-        $sql.= " target='".$this->db->escape($this->target)."',";
-        $sql.= " titre='".$this->db->escape($this->titre)."',";
-        $sql.= " langs='".$this->db->escape($this->langs)."',";
-        $sql.= " perms='".$this->db->escape($this->perms)."',";
-        $sql.= " enabled='".$this->db->escape($this->enabled)."',";
-        $sql.= " usertype='".$this->db->escape($this->user)."'";
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " menu_handler='".$this->db->escape($this->menu_handler)."',";
+        $sql .= " module='".$this->db->escape($this->module)."',";
+        $sql .= " type='".$this->db->escape($this->type)."',";
+        $sql .= " mainmenu='".$this->db->escape($this->mainmenu)."',";
+        $sql .= " leftmenu='".$this->db->escape($this->leftmenu)."',";
+        $sql .= " fk_menu=".$this->fk_menu.",";
+        $sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
+        $sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
+        $sql .= " position=".($this->position > 0 ? $this->position : 0).",";
+        $sql .= " url='".$this->db->escape($this->url)."',";
+        $sql .= " target='".$this->db->escape($this->target)."',";
+        $sql .= " titre='".$this->db->escape($this->titre)."',";
+        $sql .= " langs='".$this->db->escape($this->langs)."',";
+        $sql .= " perms='".$this->db->escape($this->perms)."',";
+        $sql .= " enabled='".$this->db->escape($this->enabled)."',";
+        $sql .= " usertype='".$this->db->escape($this->user)."'";
+        $sql .= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql)
+        if (!$resql)
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
 
@@ -377,37 +377,37 @@ class Menubase
         //global $langs;
 
         $sql = "SELECT";
-        $sql.= " t.rowid,";
-        $sql.= " t.menu_handler,";
-        $sql.= " t.entity,";
-        $sql.= " t.module,";
-        $sql.= " t.type,";
-        $sql.= " t.mainmenu,";
-        $sql.= " t.leftmenu,";
-        $sql.= " t.fk_menu,";
-        $sql.= " t.fk_mainmenu,";
-        $sql.= " t.fk_leftmenu,";
-        $sql.= " t.position,";
-        $sql.= " t.url,";
-        $sql.= " t.target,";
-        $sql.= " t.titre,";
-        $sql.= " t.langs,";
-        $sql.= " t.perms,";
-        $sql.= " t.enabled,";
-        $sql.= " t.usertype as user,";
-        $sql.= " t.tms";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu as t";
-        $sql.= " WHERE t.rowid = ".$id;
+        $sql .= " t.rowid,";
+        $sql .= " t.menu_handler,";
+        $sql .= " t.entity,";
+        $sql .= " t.module,";
+        $sql .= " t.type,";
+        $sql .= " t.mainmenu,";
+        $sql .= " t.leftmenu,";
+        $sql .= " t.fk_menu,";
+        $sql .= " t.fk_mainmenu,";
+        $sql .= " t.fk_leftmenu,";
+        $sql .= " t.position,";
+        $sql .= " t.url,";
+        $sql .= " t.target,";
+        $sql .= " t.titre,";
+        $sql .= " t.langs,";
+        $sql .= " t.perms,";
+        $sql .= " t.enabled,";
+        $sql .= " t.usertype as user,";
+        $sql .= " t.tms";
+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as t";
+        $sql .= " WHERE t.rowid = ".$id;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
+                $this->id = $obj->rowid;
 
                 $this->menu_handler = $obj->menu_handler;
                 $this->entity = $obj->entity;
@@ -434,7 +434,7 @@ class Menubase
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -451,13 +451,13 @@ class Menubase
         //global $conf, $langs;
 
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if (! $resql)
+        if (!$resql)
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
 
@@ -474,25 +474,25 @@ class Menubase
      */
     public function initAsSpecimen()
     {
-        $this->id=0;
+        $this->id = 0;
 
-        $this->menu_handler='all';
-        $this->module='specimen';
-        $this->type='top';
-        $this->mainmenu='';
-        $this->fk_menu='0';
-        $this->position='';
-        $this->url='http://dummy';
-        $this->target='';
-        $this->titre='Specimen menu';		// deprecated
-        $this->title='Specimen menu';
-        $this->langs='';
-        $this->level='';
-        $this->leftmenu='';
-        $this->perms='';
-        $this->enabled='';
-        $this->user='';
-        $this->tms='';
+        $this->menu_handler = 'all';
+        $this->module = 'specimen';
+        $this->type = 'top';
+        $this->mainmenu = '';
+        $this->fk_menu = '0';
+        $this->position = '';
+        $this->url = 'http://dummy';
+        $this->target = '';
+        $this->titre = 'Specimen menu'; // deprecated
+        $this->title = 'Specimen menu';
+        $this->langs = '';
+        $this->level = '';
+        $this->leftmenu = '';
+        $this->perms = '';
+        $this->enabled = '';
+        $this->user = '';
+        $this->tms = '';
     }
 
 
@@ -508,16 +508,16 @@ class Menubase
      */
     public function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
     {
-        global $langs, $user, $conf;	// To export to dol_eval function
-        global $mainmenu,$leftmenu;		// To export to dol_eval function
+        global $langs, $user, $conf; // To export to dol_eval function
+        global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+        $mainmenu = $mymainmenu; // To export to dol_eval function
+        $leftmenu = $myleftmenu; // To export to dol_eval function
 
-        $newTabMenu=array();
-        foreach($tabMenu as $val)
+        $newTabMenu = array();
+        foreach ($tabMenu as $val)
         {
-            if ($val['type']=='top') $newTabMenu[]=$val;
+            if ($val['type'] == 'top') $newTabMenu[] = $val;
         }
 
         return $newTabMenu;
@@ -537,20 +537,20 @@ class Menubase
      */
     public function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
     {
-        global $langs, $user, $conf; 	// To export to dol_eval function
-        global $mainmenu,$leftmenu; 	// To export to dol_eval function
+        global $langs, $user, $conf; // To export to dol_eval function
+        global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+        $mainmenu = $mymainmenu; // To export to dol_eval function
+        $leftmenu = $myleftmenu; // To export to dol_eval function
 
         // Detect what is top mainmenu id
-        $menutopid='';
-        foreach($tabMenu as $key => $val)
+        $menutopid = '';
+        foreach ($tabMenu as $key => $val)
         {
             // Define menutopid of mainmenu
             if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
             {
-                $menutopid=$val['rowid'];
+                $menutopid = $val['rowid'];
                 break;
             }
         }
@@ -562,7 +562,7 @@ class Menubase
         $this->recur($tabMenu, $menutopid, 1);
 
         // Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
-        foreach($tabMenu as $key => $val)
+        foreach ($tabMenu as $key => $val)
         {
         	//var_dump($tabMenu);
         	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
@@ -578,16 +578,16 @@ class Menubase
         		else
         		{
         			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
-        			$searchlastsub=0;$lastid=0;$nextid=0;$found=0;
-        			foreach($this->newmenu->liste as $keyparent => $valparent)
+        			$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;
+        			foreach ($this->newmenu->liste as $keyparent => $valparent)
         			{
         				//var_dump($valparent);
         				if ($searchlastsub)    // If we started to search for last submenu
         				{
-        					if ($valparent['level'] >= $searchlastsub) $lastid=$keyparent;
+        					if ($valparent['level'] >= $searchlastsub) $lastid = $keyparent;
         					if ($valparent['level'] < $searchlastsub)
         					{
-        						$nextid=$keyparent;
+        						$nextid = $keyparent;
         						break;
         					}
         				}
@@ -595,9 +595,9 @@ class Menubase
         				{
         					//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
         					// Now we look to find last subelement of this parent (we add at end)
-        					$searchlastsub=($valparent['level']+1);
-        					$lastid=$keyparent;
-        					$found=1;
+        					$searchlastsub = ($valparent['level'] + 1);
+        					$lastid = $keyparent;
+        					$found = 1;
         				}
         			}
         			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
@@ -629,16 +629,16 @@ class Menubase
         global $langs, $user, $conf; // To export to dol_eval function
         global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu=$mymainmenu;  // To export to dol_eval function
-        $leftmenu=$myleftmenu;  // To export to dol_eval function
+        $mainmenu = $mymainmenu; // To export to dol_eval function
+        $leftmenu = $myleftmenu; // To export to dol_eval function
 
         $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
-        $sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-        $sql.= " WHERE m.entity IN (0,".$conf->entity.")";
-        $sql.= " AND m.menu_handler IN ('".$menu_handler."','all')";
-        if ($type_user == 0) $sql.= " AND m.usertype IN (0,2)";
-        if ($type_user == 1) $sql.= " AND m.usertype IN (1,2)";
-        $sql.= " ORDER BY m.position, m.rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
+        $sql .= " WHERE m.entity IN (0,".$conf->entity.")";
+        $sql .= " AND m.menu_handler IN ('".$menu_handler."','all')";
+        if ($type_user == 0) $sql .= " AND m.usertype IN (0,2)";
+        if ($type_user == 1) $sql .= " AND m.usertype IN (1,2)";
+        $sql .= " ORDER BY m.position, m.rowid";
         //print $sql;
 
         //dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);
@@ -658,8 +658,8 @@ class Menubase
                 $perms = true;
                 if ($menu['perms'])
                 {
-                	$tmpcond=$menu['perms'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond);	// Force part of condition to true
+                	$tmpcond = $menu['perms'];
+                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
                 	$perms = verifCond($tmpcond);
                     //print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
                 }
@@ -668,19 +668,19 @@ class Menubase
                 $enabled = true;
                 if ($menu['enabled'])
                 {
-                	$tmpcond=$menu['enabled'];
-                	if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond);	// Force part of condition to true
+                	$tmpcond = $menu['enabled'];
+                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
                     $enabled = verifCond($tmpcond);
                 }
 
                 // Define $title
                 if ($enabled)
                 {
-                	$title = $langs->trans($menu['titre']);		// If $menu['titre'] start with $, a dol_eval is done.
+                	$title = $langs->trans($menu['titre']); // If $menu['titre'] start with $, a dol_eval is done.
                 	//var_dump($title.'-'.$menu['titre']);
                     if ($title == $menu['titre'])   // Translation not found
                     {
-                        if (! empty($menu['langs']))    // If there is a dedicated translation file
+                        if (!empty($menu['langs']))    // If there is a dedicated translation file
                         {
                         	//print 'Load file '.$menu['langs'].'<br>';
                             $langs->load($menu['langs']);
@@ -715,10 +715,10 @@ class Menubase
                     $tabMenu[$b]['module']      = $menu['module'];
                     $tabMenu[$b]['fk_menu']     = $menu['fk_menu'];
                     $tabMenu[$b]['url']         = $menu['url'];
-                    if (! preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url']))
+                    if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url']))
                     {
-                        if (preg_match('/\?/', $tabMenu[$b]['url'])) $tabMenu[$b]['url'].='&amp;idmenu='.$menu['rowid'];
-                        else $tabMenu[$b]['url'].='?idmenu='.$menu['rowid'];
+                        if (preg_match('/\?/', $tabMenu[$b]['url'])) $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];
+                        else $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];
                     }
                     $tabMenu[$b]['titre']       = $title;
                     $tabMenu[$b]['target']      = $menu['target'];
@@ -767,10 +767,10 @@ class Menubase
         for ($x = 0; $x < $num; $x++)
         {
             //si un element a pour pere : $pere
-            if ( (($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
+            if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
             {
-                $this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level-1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
-                $this->recur($tab, $tab[$x]['rowid'], ($level+1));
+                $this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
+                $this->recur($tab, $tab[$x]['rowid'], ($level + 1));
             }
         }
     }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 00ca3f3d45f..9faa3762111 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3911,9 +3911,9 @@ function dol_print_error($db = '', $error = '', $errors = null)
 	}
 
 	if (empty($dolibarr_main_prod)) print $out;
-	else
+	else	// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
 	{
-		print 'This website is currently temporarly offline. This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";
+		print 'This website is currently temporarly offline.<br><br>This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";
 		$langs->load("errors");
 		print $langs->trans("DolibarrHasDetectedError").'. ';
 		print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 4e5cbb92c02..deac3de6157 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -42,9 +42,9 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
     global $db, $langs;
 
     if (empty($objectname)) return -1;
-    if (empty($readdir)) $readdir=$destdir;
+    if (empty($readdir)) $readdir = $destdir;
 
-    if (! empty($addfieldentry['arrayofkeyval']) && ! is_array($addfieldentry['arrayofkeyval']))
+    if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))
     {
     	dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
     	return -1;
@@ -63,17 +63,17 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
     		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
     		return -2;
     	}
-    	if (! preg_match('/^(integer|price|sellist|date|varchar|double|text|html)/', $addfieldentry['type'])
-    		&& ! preg_match('/^(boolean|real|timestamp)$/', $addfieldentry['type']))
+    	if (!preg_match('/^(integer|price|sellist|varchar|double|text|html|duration)/', $addfieldentry['type'])
+    		&& !preg_match('/^(boolean|real|date|datetime|timestamp)$/', $addfieldentry['type']))
     	{
     		setEventMessages($langs->trans('BadValueForType', $objectname), null, 'errors');
     		return -2;
     	}
     }
 
-    $pathoffiletoeditsrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
-    $pathoffiletoedittarget=$destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
-    if (! dol_is_file($pathoffiletoeditsrc))
+    $pathoffiletoeditsrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
+    $pathoffiletoedittarget = $destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
+    if (!dol_is_file($pathoffiletoeditsrc))
     {
     	$langs->load("errors");
         setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
@@ -86,7 +86,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
     try
     {
         include_once $pathoffiletoeditsrc;
-        if (class_exists($objectname)) $object=new $objectname($db);
+        if (class_exists($objectname)) $object = new $objectname($db);
         else return -4;
 
         // Backup old file
@@ -100,86 +100,86 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
         {
         	if (is_array($addfieldentry) && count($addfieldentry))
         	{
-				$name=$addfieldentry['name'];
+				$name = $addfieldentry['name'];
         		unset($addfieldentry['name']);
 
-        		$object->fields[$name]=$addfieldentry;
+        		$object->fields[$name] = $addfieldentry;
         	}
-        	if (! empty($delfieldentry))
+        	if (!empty($delfieldentry))
         	{
-        		$name=$delfieldentry;
+        		$name = $delfieldentry;
         		unset($object->fields[$name]);
         	}
         }
 
         dol_sort_array($object->fields, 'position');
 
-        $i=0;
+        $i = 0;
         $texttoinsert = '// BEGIN MODULEBUILDER PROPERTIES'."\n";
-        $texttoinsert.= "\t".'/**'."\n";
-        $texttoinsert.= "\t".' * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.'."\n";
-        $texttoinsert.= "\t".' */'."\n";
-        $texttoinsert.= "\t".'public $fields=array('."\n";
+        $texttoinsert .= "\t".'/**'."\n";
+        $texttoinsert .= "\t".' * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.'."\n";
+        $texttoinsert .= "\t".' */'."\n";
+        $texttoinsert .= "\t".'public $fields=array('."\n";
 
         if (count($object->fields))
         {
-            foreach($object->fields as $key => $val)
+            foreach ($object->fields as $key => $val)
             {
                 $i++;
-                $texttoinsert.= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
-                $texttoinsert.= " 'enabled'=>".($val['enabled']!=''?$val['enabled']:1).",";
-                $texttoinsert.= " 'position'=>".($val['position']!=''?$val['position']:50).",";
-                $texttoinsert.= " 'notnull'=>".(empty($val['notnull'])?0:$val['notnull']).",";
-                $texttoinsert.= " 'visible'=>".($val['visible']!=''?$val['visible']:-1).",";
-                if ($val['noteditable'])    $texttoinsert.= " 'noteditable'=>'".$val['noteditable']."',";
-                if ($val['default'])        $texttoinsert.= " 'default'=>'".$val['default']."',";
-                if ($val['index'])          $texttoinsert.= " 'index'=>".$val['index'].",";
-                if ($val['foreignkey'])     $texttoinsert.= " 'foreignkey'=>'".$val['foreignkey']."',";
-                if ($val['searchall'])      $texttoinsert.= " 'searchall'=>".$val['searchall'].",";
-                if ($val['isameasure'])     $texttoinsert.= " 'isameasure'=>'".$val['isameasure']."',";
-                if ($val['css'])            $texttoinsert.= " 'css'=>'".$val['css']."',";
-                if ($val['help'])           $texttoinsert.= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
-                if ($val['showoncombobox']) $texttoinsert.= " 'showoncombobox'=>'".$val['showoncombobox']."',";
-                if ($val['disabled'])       $texttoinsert.= " 'disabled'=>'".$val['disabled']."',";
+                $texttoinsert .= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
+                $texttoinsert .= " 'enabled'=>".($val['enabled'] != '' ? $val['enabled'] : 1).",";
+                $texttoinsert .= " 'position'=>".($val['position'] != '' ? $val['position'] : 50).",";
+                $texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 : $val['notnull']).",";
+                $texttoinsert .= " 'visible'=>".($val['visible'] != '' ? $val['visible'] : -1).",";
+                if ($val['noteditable'])    $texttoinsert .= " 'noteditable'=>'".$val['noteditable']."',";
+                if ($val['default'])        $texttoinsert .= " 'default'=>'".$val['default']."',";
+                if ($val['index'])          $texttoinsert .= " 'index'=>".$val['index'].",";
+                if ($val['foreignkey'])     $texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
+                if ($val['searchall'])      $texttoinsert .= " 'searchall'=>".$val['searchall'].",";
+                if ($val['isameasure'])     $texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
+                if ($val['css'])            $texttoinsert .= " 'css'=>'".$val['css']."',";
+                if ($val['help'])           $texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
+                if ($val['showoncombobox']) $texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+                if ($val['disabled'])       $texttoinsert .= " 'disabled'=>'".$val['disabled']."',";
                 if ($val['arrayofkeyval'])
                 {
-                	$texttoinsert.= " 'arrayofkeyval'=>array(";
-                	$i=0;
-                	foreach($val['arrayofkeyval'] as $key2 => $val2)
+                	$texttoinsert .= " 'arrayofkeyval'=>array(";
+                	$i = 0;
+                	foreach ($val['arrayofkeyval'] as $key2 => $val2)
                 	{
-                		if ($i) $texttoinsert.=", ";
-                		$texttoinsert.="'".$key2."'=>'".$val2."'";
+                		if ($i) $texttoinsert .= ", ";
+                		$texttoinsert .= "'".$key2."'=>'".$val2."'";
                 		$i++;
                 	}
-                	$texttoinsert.= "),";
+                	$texttoinsert .= "),";
                 }
-                if ($val['comment'])        $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
+                if ($val['comment'])        $texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
 
-                $texttoinsert.= "),\n";
+                $texttoinsert .= "),\n";
             }
         }
 
-        $texttoinsert.= "\t".');'."\n";
+        $texttoinsert .= "\t".');'."\n";
 		//print ($texttoinsert);exit;
 
         if (count($object->fields))
         {
-        	$typetotypephp=array('integer'=>'integer', 'varchar'=>'string');
+        	//$typetotypephp=array('integer'=>'integer', 'duration'=>'integer', 'varchar'=>'string');
 
-        	foreach($object->fields as $key => $val)
+        	foreach ($object->fields as $key => $val)
             {
                 $i++;
                 //$typephp=$typetotypephp[$val['type']];
-                $texttoinsert.= "\t".'public $'.$key.";";
+                $texttoinsert .= "\t".'public $'.$key.";";
                 //if ($key == 'rowid')  $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
                 //if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
                 //$texttoinsert.= ($val['notnull']?' NOT NULL':'');
                 //if ($i < count($object->fields)) $texttoinsert.=";";
-                $texttoinsert.= "\n";
+                $texttoinsert .= "\n";
             }
         }
 
-        $texttoinsert.= "\t".'// END MODULEBUILDER PROPERTIES';
+        $texttoinsert .= "\t".'// END MODULEBUILDER PROPERTIES';
 
         //print($texttoinsert);exit;
 
@@ -193,7 +193,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 
         return $object;
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
         print $e->getMessage();
         return -5;
@@ -219,14 +219,14 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
     $error = 0;
 
     if (empty($objectname)) return -1;
-    if (empty($readdir)) $readdir=$destdir;
+    if (empty($readdir)) $readdir = $destdir;
 
-    $pathoffiletoclasssrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
+    $pathoffiletoclasssrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
 
     // Edit .sql file
-    $pathoffiletoeditsrc=$readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-    $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
-	if (! dol_is_file($pathoffiletoeditsrc))
+    $pathoffiletoeditsrc = $readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
+    $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+	if (!dol_is_file($pathoffiletoeditsrc))
     {
     	$langs->load("errors");
     	setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
@@ -236,14 +236,14 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
     // Load object from myobject.class.php
     try
     {
-    	if (! is_object($object))
+    	if (!is_object($object))
     	{
     		include_once $pathoffiletoclasssrc;
-        	if (class_exists($objectname)) $object=new $objectname($db);
+        	if (class_exists($objectname)) $object = new $objectname($db);
         	else return -1;
     	}
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
         print $e->getMessage();
     }
@@ -253,38 +253,38 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 
     $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
-    $i=0;
+    $i = 0;
     $texttoinsert = '-- BEGIN MODULEBUILDER FIELDS'."\n";
     if (count($object->fields))
     {
-        foreach($object->fields as $key => $val)
+        foreach ($object->fields as $key => $val)
         {
             $i++;
 
             $type = $val['type'];
-            $type = preg_replace('/:.*$/', '', $type);		// For case type = 'integer:Societe:societe/class/societe.class.php'
+            $type = preg_replace('/:.*$/', '', $type); // For case type = 'integer:Societe:societe/class/societe.class.php'
 
-            if ($type == 'html') $type = 'text';            // html modulebuilder type is a text type in database
-            elseif ($type == 'price') $type = 'double';            // html modulebuilder type is a text type in database
-            elseif ($type == 'link' || $type == 'sellist') $type = 'integer';
-            $texttoinsert.= "\t".$key." ".$type;
-            if ($key == 'rowid')  $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY';
-            if ($key == 'entity') $texttoinsert.= ' DEFAULT 1';
+            if ($type == 'html') $type = 'text'; // html modulebuilder type is a text type in database
+            elseif ($type == 'price') $type = 'double'; // html modulebuilder type is a text type in database
+            elseif (in_array($type, array('link', 'sellist', 'duration'))) $type = 'integer';
+            $texttoinsert .= "\t".$key." ".$type;
+            if ($key == 'rowid')  $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
+            if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
             else
             {
             	if ($val['default'] != '')
             	{
-            		if (preg_match('/^null$/i', $val['default'])) $texttoinsert.= " DEFAULT NULL";
-            		elseif (preg_match('/varchar/', $type)) $texttoinsert.= " DEFAULT '".$db->escape($val['default'])."'";
-            		else $texttoinsert.= (($val['default'] > 0)?' DEFAULT '.$val['default']:'');
+            		if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
+            		elseif (preg_match('/varchar/', $type)) $texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";
+            		else $texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');
             	}
             }
-            $texttoinsert.= (($val['notnull'] > 0)?' NOT NULL':'');
-            if ($i < count($object->fields)) $texttoinsert.=", ";
-            $texttoinsert.= "\n";
+            $texttoinsert .= (($val['notnull'] > 0) ? ' NOT NULL' : '');
+            if ($i < count($object->fields)) $texttoinsert .= ", ";
+            $texttoinsert .= "\n";
         }
     }
-    $texttoinsert.= "\t".'-- END MODULEBUILDER FIELDS';
+    $texttoinsert .= "\t".'-- END MODULEBUILDER FIELDS';
 
     $contentsql = preg_replace('/-- BEGIN MODULEBUILDER FIELDS.*END MODULEBUILDER FIELDS/ims', $texttoinsert, $contentsql);
 
@@ -299,35 +299,35 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
     }
 
     // Edit .key.sql file
-    $pathoffiletoeditsrc=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
-    $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
+    $pathoffiletoeditsrc = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
+    $pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
 
     $contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
-    $i=0;
+    $i = 0;
     $texttoinsert = '-- BEGIN MODULEBUILDER INDEXES'."\n";
     if (count($object->fields))
     {
-        foreach($object->fields as $key => $val)
+        foreach ($object->fields as $key => $val)
         {
             $i++;
-            if (! empty($val['index']))
+            if (!empty($val['index']))
             {
-                $texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
-                $texttoinsert.= "\n";
+                $texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
+                $texttoinsert .= "\n";
             }
-            if (! empty($val['foreignkey']))
+            if (!empty($val['foreignkey']))
             {
-            	$tmp=explode('.', $val['foreignkey']);
-            	if (! empty($tmp[0]) && ! empty($tmp[1]))
+            	$tmp = explode('.', $val['foreignkey']);
+            	if (!empty($tmp[0]) && !empty($tmp[1]))
             	{
-            		$texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
-            		$texttoinsert.= "\n";
+            		$texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES ".$tmp[0]."(".$tmp[1].");";
+            		$texttoinsert .= "\n";
             	}
             }
         }
     }
-    $texttoinsert.= '-- END MODULEBUILDER INDEXES';
+    $texttoinsert .= '-- END MODULEBUILDER INDEXES';
 
     $contentsql = preg_replace('/-- BEGIN MODULEBUILDER INDEXES.*END MODULEBUILDER INDEXES/ims', $texttoinsert, $contentsql);
 
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index d5226bb7e3d..7a3102e8aca 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -422,7 +422,8 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	if (! empty($objectid) && $objectid > 0)
 	{
 		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
-		return $ok ? 1 : accessforbidden();
+		$params=array('objectid' => $objectid, 'features' => join(',', $featuresarray), 'features2' => $feature2);
+		return $ok ? 1 : accessforbidden('', 1, 1, 0, $params);
 	}
 
 	return 1;
@@ -660,13 +661,14 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
  *	Show a message to say access is forbidden and stop program
  *	Calling this function terminate execution of PHP.
  *
- *	@param	string	$message			    Force error message
- *	@param	int		$printheader		    Show header before
- *  @param  int		$printfooter         Show footer after
- *  @param  int		$showonlymessage     Show only message parameter. Otherwise add more information.
+ *	@param	string		$message			Force error message
+ *	@param	int			$printheader		Show header before
+ *  @param  int			$printfooter        Show footer after
+ *  @param  int			$showonlymessage    Show only message parameter. Otherwise add more information.
+ *  @param  array|null  $params         	Send params
  *  @return	void
  */
-function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0)
+function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
 {
     global $conf, $db, $user, $langs, $hookmanager;
     if (! is_object($langs))
@@ -697,7 +699,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 			$hookmanager->initHooks(array('main'));
 		}
-		$parameters = array('message'=>$message);
+		$parameters = array('message'=>$message, 'params'=>$params);
 		$reshook=$hookmanager->executeHooks('getAccessForbiddenMessage', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 		print $hookmanager->resPrint;
 		if (empty($reshook))
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 6c6e310ebf4..e0b5924cc94 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -508,7 +508,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		$title = $langs->trans("GoIntoSetupToChangeLogo");
 
 		print "\n".'<!-- Show logo on menu -->'."\n";
-		print_start_menu_entry('companylogo', 'class="tmenu tmenucompanylogo"', 1);
+		print_start_menu_entry('companylogo', 'class="tmenu tmenucompanylogo nohover"', 1);
 
 
 		print '<div class="center '.$logoContainerAdditionalClass.' menulogocontainer"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px"></div>'."\n";
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index 3c8bbcb5aec..232aac94530 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -264,12 +264,12 @@ class modEmailCollector extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
+		global $conf, $user;
 		//$this->_load_tables('/dav/sql/');
 
 		// Create extrafields
-		include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
 		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
 		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
 		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'dav@dav', '$conf->dav->enabled');
@@ -278,6 +278,60 @@ class modEmailCollector extends DolibarrModules
 
 		$sql = array();
 
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity;
+		$tmpresql = $this->db->query($tmpsql);
+		if ($tmpresql) {
+			if ($this->db->num_rows($tmpresql) == 0) {
+				$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
+				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Ticket_Requets', 'Example to collect ticket requests', 'This collector will scan your mailbox to find emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$sqlforexampleA2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleA2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleA3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
+				$sqlforexampleA3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'to', 'support@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleA4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleA4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'ticket', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sql[] = $sqlforexampleA1;
+				$sql[] = $sqlforexampleA2;
+				$sql[] = $sqlforexampleA3;
+				$sql[] = $sqlforexampleA4;
+			}
+		} else dol_print_error($this->db);
+
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses' and entity = ".$conf->entity;
+		$tmpresql = $this->db->query($tmpsql);
+		if ($tmpresql) {
+			if ($this->db->num_rows($tmpresql) == 0) {
+				$sqlforexampleB1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
+				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses', 'Example to collect any email responses', 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event with the email response will be recorded at the good place (Module Agenda must be enabled). For example, if your send a commercial proposal, order or invoice by email and your customer answers your email, the system will automatically find the answer and add it into your ERP.', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$sqlforexampleB2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleB2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses' and entity = ".$conf->entity."), 'withtrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleB3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleB3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses' and entity = ".$conf->entity."), 'recordevent', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sql[] = $sqlforexampleB1;
+				$sql[] = $sqlforexampleB2;
+				$sql[] = $sqlforexampleB3;
+			}
+		} else dol_print_error($this->db);
+
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity;
+		$tmpresql = $this->db->query($tmpsql);
+		if ($tmpresql) {
+			if ($this->db->num_rows($tmpresql) == 0) {
+				$sqlforexampleC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
+				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Leads', 'Example to collect leads', 'This collector will scan your mailbox to find emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>Note: With this initial example, the title of the lead is generated including the email. If the thirdparty can''t be found in database (new customer), the lead will be attached to the thirdparty with ID 1.', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$sqlforexampleC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleC3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
+				$sqlforexampleC3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity."), 'to', 'sales@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleC4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, actionparam, date_creation, fk_user_creat, status)";
+				$sqlforexampleC4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity."), 'project', 'tmp_aaa=EXTRACT:HEADER:^From:(.*);description=EXTRACT:BODY:(.*);title=SET:Lead or message by __tmp_aaa__ receivied by email;socid=SETIFEMPTY:1', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sql[] = $sqlforexampleC1;
+				$sql[] = $sqlforexampleC2;
+				$sql[] = $sqlforexampleC3;
+				$sql[] = $sqlforexampleC4;
+			}
+		} else dol_print_error($this->db);
+
 		return $this->_init($sql, $options);
 	}
 
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 68f4a3d5fba..8f99dcc59a1 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -35,7 +35,6 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
  */
 class modExpedition extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -133,7 +132,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();
@@ -187,7 +188,7 @@ class modExpedition extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 1101;
-		$this->rights[$r][1] = 'Lire les bons de livraison';
+		$this->rights[$r][1] = 'Read delivery receipts';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'livraison';
@@ -195,7 +196,7 @@ class modExpedition extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 1102;
-		$this->rights[$r][1] = 'Creer modifier les bons de livraison';
+		$this->rights[$r][1] = 'Create/modify delivery receipts';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'livraison';
@@ -203,7 +204,7 @@ class modExpedition extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 1104;
-		$this->rights[$r][1] = 'Valider les bons de livraison';
+		$this->rights[$r][1] = 'Validate delivery receipts';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'livraison_advance';
@@ -211,7 +212,7 @@ class modExpedition extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 1109;
-		$this->rights[$r][1] = 'Supprimer les bons de livraison';
+		$this->rights[$r][1] = 'Delete delivery receipts';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'livraison';
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 081149be51d..917da8fec25 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -269,4 +269,45 @@ class modHoliday extends DolibarrModules
 		// $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
 		// $r++;
 	}
+
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'newboxdefonly', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
+
+		// Permissions
+		$this->remove($options);
+
+		//ODT template
+		/*$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/holiday/template_holiday.odt';
+		$dirodt=DOL_DATA_ROOT.'/doctemplates/holiday';
+		$dest=$dirodt.'/template_order.odt';
+
+		if (file_exists($src) && ! file_exists($dest))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result=dol_copy($src, $dest, 0, 0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error=$langs->trans('ErrorFailToCopyFile', $src, $dest);
+				return 0;
+			}
+		}
+
+		$sql = array(
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'holiday' AND entity = ".$conf->entity,
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','holiday',".$conf->entity.")"
+		);*/
+
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index ba37ee0aa66..181bd1d84f1 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -29,70 +29,70 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("products","other"));
+$langs->loadLangs(array("products", "other"));
 
-$id=GETPOST('id', 'int');
-$action=GETPOST('action', 'alpha');
-$modulepart=GETPOST('modulepart', 'alpha')?GETPOST('modulepart', 'alpha'):'produit|service';
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
+$modulepart = GETPOST('modulepart', 'alpha') ?GETPOST('modulepart', 'alpha') : 'produit|service';
 $original_file = GETPOST("file");
-$backtourl=GETPOST('backtourl');
-$cancel=GETPOST('cancel', 'alpha');
+$backtourl = GETPOST('backtourl');
+$cancel = GETPOST('cancel', 'alpha');
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for modulepart');
-$accessallowed=0;
+$accessallowed = 0;
 if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service')
 {
-	$result=restrictedArea($user, 'produit|service', $id, 'product&product');
-	if ($modulepart=='produit|service' && (! $user->rights->produit->lire && ! $user->rights->service->lire)) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'produit|service', $id, 'product&product');
+	if ($modulepart == 'produit|service' && (!$user->rights->produit->lire && !$user->rights->service->lire)) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'project')
 {
-    $result=restrictedArea($user, 'projet', $id);
-	if (! $user->rights->projet->lire) accessforbidden();
-	$accessallowed=1;
+    $result = restrictedArea($user, 'projet', $id);
+	if (!$user->rights->projet->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'bom')
 {
-	$result=restrictedArea($user, $modulepart, $id, 'bom_bom');
-	if (! $user->rights->bom->read) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, $modulepart, $id, 'bom_bom');
+	if (!$user->rights->bom->read) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'member')
 {
-	$result=restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
-	if (! $user->rights->adherent->lire) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
+	if (!$user->rights->adherent->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'user')
 {
-	$result=restrictedArea($user, $modulepart, $id, $modulepart);
-	if (! $user->rights->user->user->lire) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, $modulepart, $id, $modulepart);
+	if (!$user->rights->user->user->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'tax')
 {
-	$result=restrictedArea($user, $modulepart, $id, 'chargesociales', 'charges');
-	if (! $user->rights->tax->charges->lire) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, $modulepart, $id, 'chargesociales', 'charges');
+	if (!$user->rights->tax->charges->lire) accessforbidden();
+	$accessallowed = 1;
 }
 elseif ($modulepart == 'bank')
 {
-	$result=restrictedArea($user, 'banque', $id, 'bank_account');
-	if (! $user->rights->banque->lire) accessforbidden();
-	$accessallowed=1;
+	$result = restrictedArea($user, 'banque', $id, 'bank_account');
+	if (!$user->rights->banque->lire) accessforbidden();
+	$accessallowed = 1;
 }
 else	// ticket, holiday, expensereport, societe...
 {
-	$result=restrictedArea($user, $modulepart, $id, $modulepart);
+	$result = restrictedArea($user, $modulepart, $id, $modulepart);
 	if (empty($user->rights->$modulepart->read) && empty($user->rights->$modulepart->lire)) accessforbidden();
-	$accessallowed=1;
+	$accessallowed = 1;
 }
 
 // Security:
 // Limit access if permissions are wrong
-if (! $accessallowed)
+if (!$accessallowed)
 {
 	accessforbidden();
 }
@@ -106,9 +106,9 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	{
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
-		$dir=$conf->product->multidir_output[$object->entity];	// By default
-		if ($object->type == Product::TYPE_PRODUCT) $dir=$conf->product->multidir_output[$object->entity];
-		if ($object->type == Product::TYPE_SERVICE) $dir=$conf->service->multidir_output[$object->entity];
+		$dir = $conf->product->multidir_output[$object->entity]; // By default
+		if ($object->type == Product::TYPE_PRODUCT) $dir = $conf->product->multidir_output[$object->entity];
+		if ($object->type == Product::TYPE_SERVICE) $dir = $conf->service->multidir_output[$object->entity];
 	}
 }
 elseif ($modulepart == 'project')
@@ -119,7 +119,7 @@ elseif ($modulepart == 'project')
     {
         $result = $object->fetch($id);
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir=$conf->projet->dir_output;	// By default
+        $dir = $conf->projet->dir_output; // By default
     }
 }
 elseif ($modulepart == 'holiday')
@@ -130,7 +130,7 @@ elseif ($modulepart == 'holiday')
 	{
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
-		$dir=$conf->$modulepart->dir_output;	// By default
+		$dir = $conf->$modulepart->dir_output; // By default
 	}
 }
 elseif ($modulepart == 'member')
@@ -141,7 +141,7 @@ elseif ($modulepart == 'member')
 	{
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
-		$dir=$conf->adherent->dir_output;	// By default
+		$dir = $conf->adherent->dir_output; // By default
 	}
 }
 elseif ($modulepart == 'societe')
@@ -152,7 +152,7 @@ elseif ($modulepart == 'societe')
     {
         $result = $object->fetch($id);
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir=$conf->$modulepart->dir_output;
+        $dir = $conf->$modulepart->dir_output;
     }
 }
 elseif ($modulepart == 'user')
@@ -163,7 +163,7 @@ elseif ($modulepart == 'user')
     {
         $result = $object->fetch($id);
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir=$conf->$modulepart->dir_output;	// By default
+        $dir = $conf->$modulepart->dir_output; // By default
     }
 }
 elseif ($modulepart == 'expensereport')
@@ -174,7 +174,7 @@ elseif ($modulepart == 'expensereport')
     {
         $result = $object->fetch($id);
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
-        $dir=$conf->expensereport->dir_output;	// By default
+        $dir = $conf->expensereport->dir_output; // By default
     }
 }
 elseif ($modulepart == 'tax')
@@ -185,7 +185,7 @@ elseif ($modulepart == 'tax')
 	{
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
-		$dir=$conf->$modulepart->dir_output;	// By default
+		$dir = $conf->$modulepart->dir_output; // By default
 	}
 }
 elseif ($modulepart == 'ticket')
@@ -196,7 +196,7 @@ elseif ($modulepart == 'ticket')
 	{
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
-		$dir=$conf->$modulepart->dir_output;	// By default
+		$dir = $conf->$modulepart->dir_output; // By default
 	}
 }
 elseif ($modulepart == 'bom')
@@ -207,7 +207,7 @@ elseif ($modulepart == 'bom')
 	{
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
-		$dir=$conf->$modulepart->dir_output;	// By default
+		$dir = $conf->$modulepart->dir_output; // By default
 	}
 }
 elseif ($modulepart == 'bank')
@@ -218,7 +218,7 @@ elseif ($modulepart == 'bank')
 	{
 		$result = $object->fetch($id);
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
-		$dir=$conf->bank->dir_output;	// By default
+		$dir = $conf->bank->dir_output; // By default
 	}
 }
 else {
@@ -227,17 +227,17 @@ else {
 
 if (empty($backtourl))
 {
-    if (in_array($modulepart, array('product','produit','service','produit|service'))) $backtourl=DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('expensereport'))) $backtourl=DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('holiday')))       $backtourl=DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('member')))        $backtourl=DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('project')))       $backtourl=DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('societe')))       $backtourl=DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('tax')))           $backtourl=DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('ticket')))        $backtourl=DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('user')))          $backtourl=DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    elseif (in_array($modulepart, array('bank')))          $backtourl=DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
-    else $backtourl=DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($_POST["file"]);
+    else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($_POST["file"]);
 }
 
 
@@ -261,9 +261,9 @@ if ($cancel)
 
 if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POST["sizex"]) != "") && (isset($_POST["sizey"]) != ""))
 {
-	$fullpath=$dir."/".$original_file;
+	$fullpath = $dir."/".$original_file;
 
-	$result=dol_imageResizeOrCrop($fullpath, 0, $_POST['sizex'], $_POST['sizey']);
+	$result = dol_imageResizeOrCrop($fullpath, 0, $_POST['sizex'], $_POST['sizey']);
 
 	if ($result == $fullpath)
 	{
@@ -274,7 +274,7 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
 		$rel_filename = preg_replace('/^[\\/]/', '', $rel_filename);
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
+		$ecmfile = new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
 		{
@@ -295,11 +295,11 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
 
 		    $ecmfile->filepath = $rel_dir;
 		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
+		    $ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
 		    $ecmfile->fullpath_orig = $fullpath;
 		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = '';    // indexed content
-		    $ecmfile->keyword = '';        // keyword content
+		    $ecmfile->description = ''; // indexed content
+		    $ecmfile->keyword = ''; // keyword content
 		    $result = $ecmfile->create($user);
 		    if ($result < 0)
 		    {
@@ -322,18 +322,18 @@ if ($action == 'confirm_resize' && (isset($_POST["file"]) != "") && (isset($_POS
 	else
 	{
 		setEventMessages($result, null, 'errors');
-		$_GET['file']=$_POST["file"];
-		$action='';
+		$_GET['file'] = $_POST["file"];
+		$action = '';
 	}
 }
 
 // Crop d'une image
 if ($action == 'confirm_crop')
 {
-	$fullpath=$dir."/".$original_file;
+	$fullpath = $dir."/".$original_file;
 
 	//var_dump($_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
-	$result=dol_imageResizeOrCrop($fullpath, 1, $_POST['w'], $_POST['h'], $_POST['x'], $_POST['y']);
+	$result = dol_imageResizeOrCrop($fullpath, 1, $_POST['w'], $_POST['h'], $_POST['x'], $_POST['y']);
 
 	if ($result == $fullpath)
 	{
@@ -344,7 +344,7 @@ if ($action == 'confirm_crop')
 		$rel_filename = preg_replace('/^[\\/]/', '', $rel_filename);
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-		$ecmfile=new EcmFiles($db);
+		$ecmfile = new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
 		if ($result > 0)   // If found
 		{
@@ -365,11 +365,11 @@ if ($action == 'confirm_crop')
 
 		    $ecmfile->filepath = $rel_dir;
 		    $ecmfile->filename = $filename;
-		    $ecmfile->label = md5_file(dol_osencode($fullpath));        // $fullpath is a full path to file
+		    $ecmfile->label = md5_file(dol_osencode($fullpath)); // $fullpath is a full path to file
 		    $ecmfile->fullpath_orig = $fullpath;
 		    $ecmfile->gen_or_uploaded = 'unknown';
-		    $ecmfile->description = '';    // indexed content
-		    $ecmfile->keyword = '';        // keyword content
+		    $ecmfile->description = ''; // indexed content
+		    $ecmfile->keyword = ''; // keyword content
 		    $result = $ecmfile->create($user);
 		    if ($result < 0)
 		    {
@@ -392,8 +392,8 @@ if ($action == 'confirm_crop')
 	else
 	{
 		setEventMessages($result, null, 'errors');
-		$_GET['file']=$_POST["file"];
-		$action='';
+		$_GET['file'] = $_POST["file"];
+		$action = '';
 	}
 }
 
@@ -402,14 +402,14 @@ if ($action == 'confirm_crop')
  * View
  */
 
-llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js','/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css'));
+llxHeader($head, $langs->trans("Image"), '', '', 0, 0, array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js', '/core/js/lib_photosresize.js'), array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css'));
 
 
 print load_fiche_titre($langs->trans("ImageEditor"));
 
-$infoarray=dol_getImageSize($dir."/".GETPOST("file", 'alpha'));
-$height=$infoarray['height'];
-$width=$infoarray['width'];
+$infoarray = dol_getImageSize($dir."/".GETPOST("file", 'alpha'));
+$height = $infoarray['height'];
+$width = $infoarray['width'];
 print $langs->trans("CurrentInformationOnImage").': ';
 print $langs->trans("Width").': <strong>'.$width.'</strong> x '.$langs->trans("Height").': <strong>'.$height.'</strong><br>';
 
@@ -450,18 +450,18 @@ print '<br>'."\n";
 
 print '<br>'."\n";
 
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
-	$infoarray=dol_getImageSize($dir."/".GETPOST("file"));
-	$height=$infoarray['height'];
-	$width=$infoarray['width'];
-	$widthforcrop=$width; $refsizeforcrop='orig'; $ratioforcrop=1;
+	$infoarray = dol_getImageSize($dir."/".GETPOST("file"));
+	$height = $infoarray['height'];
+	$width = $infoarray['width'];
+	$widthforcrop = $width; $refsizeforcrop = 'orig'; $ratioforcrop = 1;
 	// If image is too large, we use another scale.
-	if (! empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth']/2)))
+	if (!empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth'] / 2)))
 	{
-		$ratioforcrop=2;
-		$widthforcrop=round($_SESSION['dol_screenwidth'] / $ratioforcrop);
-		$refsizeforcrop='screenwidth';
+		$ratioforcrop = 2;
+		$widthforcrop = round($_SESSION['dol_screenwidth'] / $ratioforcrop);
+		$refsizeforcrop = 'screenwidth';
 	}
 
 	print '<!-- Form to crop -->'."\n";
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index e74f76669cf..6ea964bbc66 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -91,7 +91,7 @@ $(document).ready(function () {
 
 <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
 <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
-<input type="hidden" name="action" value="login">
+<input type="hidden" name="actionlogin" value="login">
 <input type="hidden" name="loginfunction" value="loginfunction" />
 <!-- Add fields to send local user information -->
 <input type="hidden" name="tz" id="tz" value="" />
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 223661bf280..e20db4be2d2 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -455,7 +455,7 @@ if ($action == 'create')
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'edit', $parameters);
     }
 
     print '</tbody>';
@@ -589,7 +589,7 @@ if (!empty($id) && $action == 'edit')
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-      	print $object->showOptionals($extrafields, 'edit');
+      	print $object->showOptionals($extrafields, 'edit', $parameters);
     }
 
 	print "</table>\n";
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 1cf2bdb2540..6556590c076 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -667,22 +667,56 @@ class EmailCollector extends CommonObject
     /**
      * Return the connectstring to use with IMAP connection function
      *
+     * @param	int		$ssl		Add /ssl tag
+     * @param	int		$norsh		Add /norsh to connectstring
      * @return string
      */
-    public function getConnectStringIMAP()
+    public function getConnectStringIMAP($ssl = 1, $norsh = 0)
     {
+    	global $conf;
+
         // Connect to IMAP
         $flags = '/service=imap'; // IMAP
-        $flags .= '/ssl'; // '/tls'
+        if ($ssl) $flags .= '/ssl'; // '/tls'
         $flags .= '/novalidate-cert';
         //$flags.='/readonly';
         //$flags.='/debug';
+        if ($norsh || ! empty($conf->global->IMPA_FORCE_NORSH)) $flags .= '/norsh';
 
         $connectstringserver = '{'.$this->host.':993'.$flags.'}';
 
         return $connectstringserver;
     }
 
+    /**
+     * Convert str to UTF-7 imap default mailbox names
+     *
+     * @param 	string $str			String to encode
+     * @return 	string				Encode string
+     */
+    public function getEncodedUtf7($str)
+    {
+    	if (function_exists('mb_convert_encoding')) {
+	    	// change spaces by entropy because mb_convert fail with spaces
+	    	$str=preg_replace("/ /", "xyxy", $str);
+	    	// if mb_convert work
+	    	if ($str = mb_convert_encoding($str, "UTF-7")) {
+	    		// change characters
+	    		$str=preg_replace("/\+A/", "&A", $str);
+	    		// change to spaces again
+	    		$str=preg_replace("/xyxy/", " ", $str);
+	    		return $str;
+	    	} else {
+	    		// print error and return false
+	    		$this->error = "error: is not possible to encode this string '".$str."'";
+	     		return false;
+	    	}
+    	}
+    	else {
+    		return $str;
+    	}
+    }
+
     /**
      * Action executed by scheduler
      * CAN BE A CRON TASK. In such a case, paramerts come from the schedule job setup field 'Parameters'
@@ -854,7 +888,7 @@ class EmailCollector extends CommonObject
 
         dol_syslog("EmailCollector::doCollectOneCollector start", LOG_DEBUG);
 
-        $langs->loadLangs(array("project", "companies", "mails", "errors", "ticket"));
+        $langs->loadLangs(array("project", "companies", "mails", "errors", "ticket", "agenda"));
 
         $error = 0;
         $this->output = '';
@@ -864,17 +898,17 @@ class EmailCollector extends CommonObject
 
         if (empty($this->host))
         {
-            $this->error = $langs->trans('ErrorFieldRequired', 'EMailHost');
+            $this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMailHost'));
             return -1;
         }
         if (empty($this->login))
         {
-            $this->error = $langs->trans('ErrorFieldRequired', 'Login');
+        	$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Login'));
             return -1;
         }
         if (empty($this->source_directory))
         {
-            $this->error = $langs->trans('ErrorFieldRequired', 'MailboxSourceDirectory');
+        	$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('MailboxSourceDirectory'));
             return -1;
         }
         if (!function_exists('imap_open'))
@@ -1060,7 +1094,6 @@ class EmailCollector extends CommonObject
                 // If there is a filter on trackid
                 if ($searchfilterdoltrackid > 0)
                 {
-                    //if (empty($headers['X-Dolibarr-TRACKID'])) continue;
                     if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))
                     {
                         $nbemailprocessed++;
@@ -1074,7 +1107,6 @@ class EmailCollector extends CommonObject
                         $nbemailprocessed++;
                         continue;
                     }
-                    //if (! empty($headers['X-Dolibarr-TRACKID']) continue;
                 }
 
                 $thirdpartystatic = new Societe($this->db);
@@ -1090,11 +1122,30 @@ class EmailCollector extends CommonObject
 
                 $this->db->begin();
 
+
                 // GET Email meta datas
                 $overview = imap_fetch_overview($connection, $imapemail, 0);
 
                 dol_syslog("** Process email - msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." subject=".$overview[0]->subject);
 
+                // Decode $overview[0]->subject according to RFC2047
+                // Can use also imap_mime_header_decode($str)
+                // Can use also mb_decode_mimeheader($str)
+                // Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
+                if (function_exists('imap_mime_header_decode')) {
+                	$elements = imap_mime_header_decode($overview[0]->subject);
+                	$newstring = '';
+                	if (! empty($elements)) {
+	                	for ($i = 0; $i < count($elements); $i++) {
+	                		$newstring .= ($newstring ? ' ' : '').$elements[$i]->text;
+	                	}
+	                	$overview[0]->subject = $newstring;
+                	}
+                }
+                elseif (function_exists('mb_decode_mimeheader')) {
+                	$overview[0]->subject = mb_decode_mimeheader($overview[0]->subject);
+                }
+
                 // Parse IMAP email structure
                 global $htmlmsg, $plainmsg, $charset, $attachments;
                 $this->getmsg($connection, $imapemail);
@@ -1459,78 +1510,85 @@ class EmailCollector extends CommonObject
                     // Create event
                     elseif ($operation['type'] == 'recordevent')
                     {
-                        if ($projectstatic->id > 0)
-                        {
-                            if ($projectfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
-                        }
-                        if ($thirdpartystatic->id > 0)
-                        {
-                            if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
-                        }
-                        if ($contactstatic->id > 0)
-                        {
-                            if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
-                        }
+                    	$alreadycreated = 0;
+                    	// TODO Check if $msg ID already in database for $conf->entity
 
-                        $description = $descriptiontitle;
-                        $description = dol_concatdesc($description, "-----");
-                        $description = dol_concatdesc($description, $descriptionmeta);
-                        $description = dol_concatdesc($description, "-----");
-                        $description = dol_concatdesc($description, $messagetext);
 
-                        $descriptionfull = $description;
-                        $descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
-                        $descriptionfull = dol_concatdesc($descriptionfull, $header);
+                    	if (! $alreadycreated)
+                    	{
+	                        if ($projectstatic->id > 0)
+	                        {
+	                            if ($projectfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
+	                        }
+	                        if ($thirdpartystatic->id > 0)
+	                        {
+	                            if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+	                        }
+	                        if ($contactstatic->id > 0)
+	                        {
+	                            if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+	                        }
 
-                        // Insert record of emails sent
-                        $actioncomm = new ActionComm($this->db);
-                        $actioncomm->type_code   = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-                        $actioncomm->code        = 'AC_'.$actioncode;
-                        $actioncomm->label       = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
-                        $actioncomm->note_private= $descriptionfull;
-                        $actioncomm->fk_project  = $projectstatic->id;
-                        $actioncomm->datep       = $date;
-                        $actioncomm->datef       = $date;
-                        $actioncomm->percentage  = -1;   // Not applicable
-                        $actioncomm->socid       = $thirdpartystatic->id;
-                        $actioncomm->contactid   = $contactstatic->id;
-	                    $actioncomm->socpeopleassigned = (!empty($contactstatic->id) ? array($contactstatic->id => '') : array());
-                        $actioncomm->authorid    = $user->id;   // User saving action
-                        $actioncomm->userownerid = $user->id;	// Owner of action
-                        // Fields when action is an email (content should be added into note)
-                        $actioncomm->email_msgid = $msgid;
-                        $actioncomm->email_from  = $fromstring;
-                        $actioncomm->email_sender= $sender;
-                        $actioncomm->email_to    = $to;
-                        $actioncomm->email_tocc  = $sendtocc;
-                        $actioncomm->email_tobcc = $sendtobcc;
-                        $actioncomm->email_subject = $subject;
-                        $actioncomm->errors_to   = '';
+	                        $description = $descriptiontitle;
+	                        $description = dol_concatdesc($description, "-----");
+	                        $description = dol_concatdesc($description, $descriptionmeta);
+	                        $description = dol_concatdesc($description, "-----");
+	                        $description = dol_concatdesc($description, $messagetext);
 
-                        if (! in_array($fk_element_type, array('societe','contact','project','user')))
-                        {
-                            $actioncomm->fk_element  = $fk_element_id;
-                            $actioncomm->elementtype = $fk_element_type;
-                        }
+	                        $descriptionfull = $description;
+	                        $descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
+	                        $descriptionfull = dol_concatdesc($descriptionfull, $header);
 
-                        //$actioncomm->extraparams = $extraparams;
+	                        // Insert record of emails sent
+	                        $actioncomm = new ActionComm($this->db);
+	                        $actioncomm->type_code   = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+	                        $actioncomm->code        = 'AC_'.$actioncode;
+	                        $actioncomm->label       = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
+	                        $actioncomm->note_private= $descriptionfull;
+	                        $actioncomm->fk_project  = $projectstatic->id;
+	                        $actioncomm->datep       = $date;
+	                        $actioncomm->datef       = $date;
+	                        $actioncomm->percentage  = -1;   // Not applicable
+	                        $actioncomm->socid       = $thirdpartystatic->id;
+	                        $actioncomm->contactid   = $contactstatic->id;
+		                    $actioncomm->socpeopleassigned = (!empty($contactstatic->id) ? array($contactstatic->id => '') : array());
+	                        $actioncomm->authorid    = $user->id;   // User saving action
+	                        $actioncomm->userownerid = $user->id;	// Owner of action
+	                        // Fields when action is an email (content should be added into note)
+	                        $actioncomm->email_msgid = $msgid;
+	                        $actioncomm->email_from  = $fromstring;
+	                        $actioncomm->email_sender= $sender;
+	                        $actioncomm->email_to    = $to;
+	                        $actioncomm->email_tocc  = $sendtocc;
+	                        $actioncomm->email_tobcc = $sendtobcc;
+	                        $actioncomm->email_subject = $subject;
+	                        $actioncomm->errors_to   = '';
 
-                        // Overwrite values with values extracted from source email
-                        $errorforthisaction = $this->overwritePropertiesOfObject($actioncomm, $operation['actionparam'], $messagetext, $subject, $header);
+	                        if (! in_array($fk_element_type, array('societe','contact','project','user')))
+	                        {
+	                            $actioncomm->fk_element  = $fk_element_id;
+	                            $actioncomm->elementtype = $fk_element_type;
+	                        }
 
-                        if ($errorforthisaction)
-                        {
-                            $errorforactions++;
-                        }
-                        else
-                        {
-                            $result = $actioncomm->create($user);
-                            if ($result <= 0)
-                            {
-                                $errorforactions++;
-                                $this->errors = $actioncomm->errors;
-                            }
-                        }
+	                        //$actioncomm->extraparams = $extraparams;
+
+	                        // Overwrite values with values extracted from source email
+	                        $errorforthisaction = $this->overwritePropertiesOfObject($actioncomm, $operation['actionparam'], $messagetext, $subject, $header);
+
+	                        if ($errorforthisaction)
+	                        {
+	                            $errorforactions++;
+	                        }
+	                        else
+	                        {
+	                            $result = $actioncomm->create($user);
+	                            if ($result <= 0)
+	                            {
+	                                $errorforactions++;
+	                                $this->errors = $actioncomm->errors;
+	                            }
+	                        }
+                    	}
                     }
                     // Create event
                     elseif ($operation['type'] == 'project')
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 02db386f236..ca543f5f2d5 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1025,7 +1025,7 @@ if ($action == 'create')
             print "</td></tr>\n";
 
             // Other attributes
-            $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
+            $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid' => $socid);
             $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $expe, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 
@@ -1034,7 +1034,7 @@ if ($action == 'create')
 				if ($object->fetch_optionals() > 0) {
 					$expe->array_options = array_merge($expe->array_options, $object->array_options);
 				}
-				print $expe->showOptionals($extrafields, 'edit');
+				print $expe->showOptionals($extrafields, 'edit', $parameters);
 			}
 
 
@@ -1994,7 +1994,7 @@ elseif ($id || $ref)
 		}
 
 		// Other attributes
-		$parameters = array('colspan' => ' colspan="3"');
+		$parameters = array('colspan' => ' colspan="3"', 'cols' => '3');
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
@@ -2459,10 +2459,10 @@ elseif ($id || $ref)
 					if (!empty($conf->productbatch->enabled)) $colspan++;
 					if (!empty($conf->stock->enabled)) $colspan++;
 
-					$lines[$i]->fetch_optionals($lines[$i]->id);
+					$line = $lines[$i];
+					$line->fetch_optionals($line->id);
 
-					print '<tr class="oddeven">';
-					if ($action == 'editline' && $lines[$i]->id == $line_id)
+					if ($action == 'editline' && $line->id == $line_id)
 					{
 						print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
 					}
@@ -2470,7 +2470,6 @@ elseif ($id || $ref)
 					{
 						print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 					}
-					print '</tr>';
 				}
 			}
 		}
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 8e27db03b45..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,9 +58,9 @@ 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 href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+    			<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/expensereport/card.php b/htdocs/expensereport/card.php
index 5cb869c6817..b24259d797a 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1532,11 +1532,11 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters = array('colspan' => ' colspan="3"');
+	$parameters = array('colspan' => ' colspan="3"', 'cols' => 3);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
     print $hookmanager->resPrint;
 	if (empty($reshook)) {
-	    print $object->showOptionals($extrafields, 'edit');
+	    print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	print '<tbody>';
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
index 43f612ea3f6..98a8351b26f 100644
--- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
@@ -49,7 +49,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 		echo price($objectlink->total_ht);
 	} ?></td>
 	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-	<td class="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
 	<?php
 }
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index eb5c959db7f..9371c6a308a 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -906,18 +906,17 @@ if ($action == 'create')
 
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="socid" value='.$soc->id.'>';
+		print '<input type="hidden" name="action" value="add">';
 
 		dol_fiche_head('');
 
 		print '<table class="border centpercent">';
 
-		print '<input type="hidden" name="socid" value='.$soc->id.'>';
 		print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("ThirdParty").'</td><td>'.$soc->getNomUrl(1).'</td></tr>';
 
-		print '<input type="hidden" name="action" value="add">';
-
 		// Ref
-		print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans("Draft").'</td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans("Draft").'</td></tr>';
 
 		// Description (must be a textarea and not html must be allowed (used in list view)
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
@@ -963,15 +962,15 @@ if ($action == 'create')
         // Model
         print '<tr>';
         print '<td>'.$langs->trans("DefaultModel").'</td>';
-        print '<td colspan="2">';
+        print '<td>';
         $liste = ModelePDFFicheinter::liste_modeles($db);
         print $form->selectarray('model', $liste, $conf->global->FICHEINTER_ADDON_PDF);
         print "</td></tr>";
 
         // Public note
         print '<tr>';
-        print '<td tdtop">'.$langs->trans('NotePublic').'</td>';
-        print '<td colspan="2">';
+        print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
+        print '<td>';
         $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
         print $doleditor->Create(1);
         //print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
@@ -982,7 +981,7 @@ if ($action == 'create')
         {
         	print '<tr>';
         	print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-        	print '<td colspan="2">';
+        	print '<td>';
         	$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
         	print $doleditor->Create(1);
         	//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
@@ -990,7 +989,7 @@ if ($action == 'create')
         }
 
         // Other attributes
-        $parameters = array('colspan' => ' colspan="2"');
+        $parameters = array();
         $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
         if (empty($reshook))
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index 95c67f987f5..21dc2314716 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -50,7 +50,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 		<td class="center"><?php echo dol_print_date($objectlink->datev, 'day'); ?></td>
 		<td></td>
 		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-		<td class="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 	</tr>
 	<?php
 }
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 9701f43d993..7e330635de8 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1610,15 +1610,13 @@ if ($action == 'create')
 	print '<tr><td>'.$langs->trans('RefSupplier').'</td><td><input name="refsupplier" type="text"></td>';
 	print '</tr>';
 
-	print '</td></tr>';
-
 	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	$form->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	$form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
@@ -1636,7 +1634,7 @@ if ($action == 'create')
 	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && !empty($conf->banque->enabled))
 	{
 		$langs->load("bank");
-		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
+		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 		$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
 		print '</td></tr>';
 	}
@@ -1647,10 +1645,9 @@ if ($action == 'create')
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
-		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
+		print '<tr><td>'.$langs->trans('Project').'</td><td>';
 		$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1);
 		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$societe->id).'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddProject").'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
-
 		print '</td></tr>';
 	}
 
@@ -1659,7 +1656,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
-		print '<td colspan="3" class="maxwidthonsmartphone">';
+		print '<td class="maxwidthonsmartphone">';
 		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 		print '</td></tr>';
 	}
@@ -1669,7 +1666,7 @@ if ($action == 'create')
 	{
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-		print '<td colspan="3" class="maxwidthonsmartphone">';
+		print '<td class="maxwidthonsmartphone">';
 		print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
 		print '</td></tr>';
 	}
@@ -1700,26 +1697,26 @@ if ($action == 'create')
 		print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 
 		$newclassname = $classname;
-		print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
-		print '<tr><td>'.$langs->trans('AmountHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
-		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
+		print '<tr><td>'.$langs->trans($newclassname).'</td><td>'.$objectsrc->getNomUrl(1).'</td></tr>';
+		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
+		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
 		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
 		{
-			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
+			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax1)."</td></tr>";
 		}
 
 		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
 		{
-			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
+			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax2)."</td></tr>";
 		}
 
-		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
+		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
 		if (!empty($conf->multicurrency->enabled))
 		{
-			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
-			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_tva).'</td></tr>';
-			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ttc).'</td></tr>';
+			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
+			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva).'</td></tr>';
+			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc).'</td></tr>';
 		}
 	}
 
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 7927af38786..098b6b93710 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -336,22 +336,22 @@ if ($action == 'create' && !$error) {
 	print '<table class="border centpercent">';
 
 	// Ref
-	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans('Draft').'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
 
 	// Ref supplier
 	print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.dol_escape_htmltag(isset($_POST['ref_supplier']) ? GETPOST('ref_supplier', 'alpha', 2) : '').'" type="text"></td>';
 	print '</tr>';
 
 	// Date invoice
-	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td colspan="2">';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
 	print $html->selectDate('', '', '', '', '', "add", 1, 1);
 	print '</td></tr>';
 	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	$html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	$html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 	// Project
@@ -359,7 +359,7 @@ if ($action == 'create' && !$error) {
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
-		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
+		print '<tr><td>'.$langs->trans('Project').'</td><td>';
 		$formproject->select_projects($soc->id, $projectid, 'projectid');
 		print '</td></tr>';
 	}
@@ -367,9 +367,7 @@ if ($action == 'create' && !$error) {
 	// Other attributes
 	$parameters = array(
 			'objectsrc' => $objectsrc,
-			'idsrc' => $listoforders,
-			'colspan' => ' colspan="2"',
-	        'cols'=>2
+			'idsrc' => $listoforders
 	);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
@@ -390,7 +388,7 @@ if ($action == 'create' && !$error) {
 	// Public note
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-	print '<td colspan="2">';
+	print '<td>';
 	print '<textarea name="note_public" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">';
 
 	print $langs->trans("Orders").": ".implode(', ', $listoforders);
@@ -401,7 +399,7 @@ if ($action == 'create' && !$error) {
 	if (empty($user->socid)) {
 		print '<tr>';
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-		print '<td colspan="2">';
+		print '<td>';
 		print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">';
 
 		print '</textarea></td></tr>';
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 2af9de7223d..079e49bb79d 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -55,7 +55,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
     		echo price($objectlink->total_ht);
     	} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-    	<td class="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+    	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
 	<?php
 }
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6a5e29892d2..a4a7964ca5a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2674,11 +2674,14 @@ else
 		else $calculationrule = (empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND) ? 'totalofround' : 'roundoftotal');
 		if ($calculationrule == 'totalofround') $calculationrulenum = 1;
 		else  $calculationrulenum = 2;
-		$s = $langs->trans("ReCalculate").' ';
-		$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=totalofround">'.$langs->trans("Mode1").'</a>';
-		$s .= ' / ';
-		$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=roundoftotal">'.$langs->trans("Mode2").'</a>';
-		print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum).'<br>'.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'));
+		// Show link for "recalculate"
+		if ($object->getVentilExportCompta() == 0) {
+			$s = $langs->trans("ReCalculate").' ';
+			$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=totalofround">'.$langs->trans("Mode1").'</a>';
+			$s .= ' / ';
+			$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=roundoftotal">'.$langs->trans("Mode2").'</a>';
+			print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum).'<br>'.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'));
+		}
 		print '</div></td></tr>';
 
 		// Amount Local Taxes
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index cc3d3084464..ec96ce0e297 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -66,7 +66,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
     		}
     	} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-    	<td class="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+    	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
     <?php
 }
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index c44c588b335..e1ba230fe38 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -304,12 +304,31 @@ class Holiday extends CommonObject
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."holiday");
 
-			if (!$notrigger)
+			if ($this->id)
 			{
-				// Call trigger
-				$result = $this->call_trigger('HOLIDAY_CREATE', $user);
-				if ($result < 0) { $error++; }
-				// End call triggers
+				// update ref
+				$initialref = '(PROV'.$this->id.')';
+				if (!empty($this->ref)) $initialref = $this->ref;
+
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."holiday SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id;
+				if ($this->db->query($sql))
+				{
+					$this->ref = $initialref;
+
+					if (!$error)
+					{
+						$result = $this->insertExtraFields();
+						if ($result < 0) $error++;
+					}
+
+					if (!$error && !$notrigger)
+					{
+						// Call trigger
+						$result = $this->call_trigger('HOLIDAY_CREATE', $user);
+						if ($result < 0) { $error++; }
+						// End call triggers
+					}
+				}
 			}
 		}
 
@@ -337,7 +356,7 @@ class Holiday extends CommonObject
 	 *
 	 *  @param	int		$id         Id object
 	 *  @param	string	$ref        Ref object
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		<0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -402,12 +421,17 @@ class Holiday extends CommonObject
 				$this->fk_user_create = $obj->fk_user_create;
 				$this->fk_type = $obj->fk_type;
 				$this->entity = $obj->entity;
+
+				$this->fetch_optionals();
+
+				$result = 1;
+			}
+			else {
+				$result = 0;
 			}
 			$this->db->free($resql);
 
-			$this->fetch_optionals();
-
-			return 1;
+			return $result;
 		}
 		else
 		{
diff --git a/htdocs/includes/jquery/plugins/multiselect/jquery.multi-select.js b/htdocs/includes/jquery/plugins/multiselect/jquery.multi-select.js
deleted file mode 100644
index ee62d1f588d..00000000000
--- a/htdocs/includes/jquery/plugins/multiselect/jquery.multi-select.js
+++ /dev/null
@@ -1,360 +0,0 @@
-// jquery.multi-select.js
-// by mySociety
-// https://github.com/mysociety/jquery-multi-select
-
-;(function($) {
-
-  "use strict";
-
-  var pluginName = "multiSelect",
-    defaults = {
-      'containerHTML': '<div class="multi-select-container">',
-      'menuHTML': '<div class="multi-select-menu">',
-      'buttonHTML': '<span class="multi-select-button">',
-      'menuItemsHTML': '<div class="multi-select-menuitems">',
-      'menuItemHTML': '<label class="multi-select-menuitem">',
-      'presetsHTML': '<div class="multi-select-presets">',
-      'activeClass': 'multi-select-container--open',
-      'noneText': '-- Select --',
-      'allText': undefined,
-      'presets': undefined,
-      'positionedMenuClass': 'multi-select-container--positioned',
-      'positionMenuWithin': undefined,
-      'viewportBottomGutter': 20,
-      'menuMinHeight': 200
-    };
-
-  /**
-   * @constructor
-   */
-  function MultiSelect(element, options) {
-    this.element = element;
-    this.$element = $(element);
-    this.settings = $.extend( {}, defaults, options );
-    this._defaults = defaults;
-    this._name = pluginName;
-    this.init();
-  }
-
-  function arraysAreEqual(array1, array2) {
-    if ( array1.length != array2.length ){
-      return false;
-    }
-
-    array1.sort();
-    array2.sort();
-
-    for ( var i = 0; i < array1.length; i++ ){
-      if ( array1[i] !== array2[i] ){
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  $.extend(MultiSelect.prototype, {
-
-    init: function() {
-      this.checkSuitableInput();
-      this.findLabels();
-      this.constructContainer();
-      this.constructButton();
-      this.constructMenu();
-
-      this.setUpBodyClickListener();
-      this.setUpLabelsClickListener();
-
-      this.$element.hide();
-    },
-
-    checkSuitableInput: function(text) {
-      if ( this.$element.is('select[multiple]') === false ) {
-        throw new Error('$.multiSelect only works on <select multiple> elements');
-      }
-    },
-
-    findLabels: function() {
-      this.$labels = $('label[for="' + this.$element.attr('id') + '"]');
-    },
-
-    constructContainer: function() {
-      this.$container = $(this.settings['containerHTML']);
-      this.$element.data('multi-select-container', this.$container);
-      this.$container.insertAfter(this.$element);
-    },
-
-    constructButton: function() {
-      var _this = this;
-      this.$button = $(this.settings['buttonHTML']);
-      this.$button.attr({
-        'role': 'button',
-        'aria-haspopup': 'true',
-        'tabindex': 0,
-        'aria-label': this.$labels.eq(0).text()
-      })
-      .on('keydown.multiselect', function(e) {
-        var key = e.which;
-        var returnKey = 13;
-        var spaceKey = 32;
-        if ((key === returnKey) || (key === spaceKey)) {
-          _this.$button.click();
-        }
-      }).on('click.multiselect', function(e) {
-        _this.menuToggle();
-      })
-      .appendTo(this.$container);
-
-      this.$element.on('change.multiselect', function() {
-        _this.updateButtonContents();
-      });
-
-      this.updateButtonContents();
-    },
-
-    updateButtonContents: function() {
-      var _this = this;
-      var options = [];
-      var selected = [];
-
-      this.$element.children('option').each(function() {
-        var text = /** @type string */ ($(this).text());
-        options.push(text);
-        if ($(this).is(':selected')) {
-          selected.push( $.trim(text) );
-        }
-      });
-
-      this.$button.empty();
-
-      if (selected.length == 0) {
-        this.$button.text( this.settings['noneText'] );
-      } else if ( (selected.length === options.length) && this.settings['allText']) {
-        this.$button.text( this.settings['allText'] );
-      } else {
-        this.$button.text( selected.join(', ') );
-      }
-    },
-
-    constructMenu: function() {
-      var _this = this;
-
-      this.$menu = $(this.settings['menuHTML']);
-      this.$menu.attr({
-        'role': 'menu'
-      }).on('keyup.multiselect', function(e){
-        var key = e.which;
-        var escapeKey = 27;
-        if (key === escapeKey) {
-          _this.menuHide();
-        }
-      })
-      .appendTo(this.$container);
-
-      this.constructMenuItems();
-
-      if ( this.settings['presets'] ) {
-        this.constructPresets();
-      }
-    },
-
-    constructMenuItems: function() {
-      var _this = this;
-
-      this.$menuItems = $(this.settings['menuItemsHTML']);
-      this.$menu.append(this.$menuItems);
-
-      this.$element.on('change.multiselect', function(e, internal) {
-        // Don't need to update the menu items if this
-        // change event was fired by our tickbox handler.
-        if(internal !== true){
-          _this.updateMenuItems();
-        }
-      });
-
-      this.updateMenuItems();
-    },
-
-    updateMenuItems: function() {
-      var _this = this;
-      this.$menuItems.empty();
-
-      this.$element.children('option').each(function(option_index, option) {
-        var $item = _this.constructMenuItem($(option), option_index);
-        _this.$menuItems.append($item);
-      });
-    },
-
-    constructPresets: function() {
-      var _this = this;
-      this.$presets = $(this.settings['presetsHTML']);
-      this.$menu.prepend(this.$presets);
-
-      $.each(this.settings['presets'], function(i, preset){
-        var unique_id = _this.$element.attr('name') + '_preset_' + i;
-        var $item = $(_this.settings['menuItemHTML'])
-          .attr({
-            'for': unique_id,
-            'role': 'menuitem'
-          })
-          .text(' ' + preset.name)
-          .appendTo(_this.$presets);
-
-        var $input = $('<input>')
-          .attr({
-            'type': 'radio',
-            'name': _this.$element.attr('name') + '_presets',
-            'id': unique_id
-          })
-          .prependTo($item);
-
-        $input.on('change.multiselect', function(){
-          _this.$element.val(preset.options);
-          _this.$element.trigger('change');
-        });
-      });
-
-      this.$element.on('change.multiselect', function() {
-        _this.updatePresets();
-      });
-
-      this.updatePresets();
-    },
-
-    updatePresets: function() {
-      var _this = this;
-
-      $.each(this.settings['presets'], function(i, preset){
-        var unique_id = _this.$element.attr('name') + '_preset_' + i;
-        var $input = _this.$presets.find('#' + unique_id);
-
-        if ( arraysAreEqual(preset.options || [], _this.$element.val() || []) ){
-          $input.prop('checked', true);
-        } else {
-          $input.prop('checked', false);
-        }
-      });
-    },
-
-    constructMenuItem: function($option, option_index) {
-      var unique_id = this.$element.attr('name') + '_' + option_index;
-      var $item = $(this.settings['menuItemHTML'])
-        .attr({
-          'for': unique_id,
-          'role': 'menuitem'
-        })
-        .text(' ' + $option.text());
-
-      var $input = $('<input>')
-        .attr({
-          'type': 'checkbox',
-          'id': unique_id,
-          'value': $option.val()
-        })
-        .prependTo($item);
-
-      if ( $option.is(':disabled') ) {
-        $input.attr('disabled', 'disabled');
-      }
-      if ( $option.is(':selected') ) {
-        $input.prop('checked', 'checked');
-      }
-
-      $input.on('change.multiselect', function() {
-        if ($(this).prop('checked')) {
-          $option.prop('selected', true);
-        } else {
-          $option.prop('selected', false);
-        }
-
-        // .prop() on its own doesn't generate a change event.
-        // Other plugins might want to do stuff onChange.
-        $option.trigger('change', [true]);
-      });
-
-      return $item;
-    },
-
-    setUpBodyClickListener: function() {
-      var _this = this;
-
-      // Hide the $menu when you click outside of it.
-      $('html').on('click.multiselect', function(){
-        _this.menuHide();
-      });
-
-      // Stop click events from inside the $button or $menu from
-      // bubbling up to the body and closing the menu!
-      this.$container.on('click.multiselect', function(e){
-        e.stopPropagation();
-      });
-    },
-
-    setUpLabelsClickListener: function() {
-      var _this = this;
-      this.$labels.on('click.multiselect', function(e) {
-        e.preventDefault();
-        e.stopPropagation();
-        _this.menuToggle();
-      });
-    },
-
-    menuShow: function() {
-      $('html').trigger('click.multiselect'); // Close any other open menus
-      this.$container.addClass(this.settings['activeClass']);
-
-      if ( this.settings['positionMenuWithin'] && this.settings['positionMenuWithin'] instanceof $ ) {
-        var menuLeftEdge = this.$menu.offset().left + this.$menu.outerWidth();
-        var withinLeftEdge = this.settings['positionMenuWithin'].offset().left +
-          this.settings['positionMenuWithin'].outerWidth();
-
-        if ( menuLeftEdge > withinLeftEdge ) {
-          this.$menu.css( 'width', (withinLeftEdge - this.$menu.offset().left) );
-          this.$container.addClass(this.settings['positionedMenuClass']);
-        }
-      }
-
-      var menuBottom = this.$menu.offset().top + this.$menu.outerHeight();
-      var viewportBottom = $(window).scrollTop() + $(window).height();
-      if ( menuBottom > viewportBottom - this.settings['viewportBottomGutter'] ) {
-        this.$menu.css({
-          'maxHeight': Math.max(
-            viewportBottom - this.settings['viewportBottomGutter'] - this.$menu.offset().top,
-            this.settings['menuMinHeight']
-          ),
-          'overflow': 'scroll'
-        });
-      } else {
-        this.$menu.css({
-          'maxHeight': '',
-          'overflow': ''
-        });
-      }
-    },
-
-    menuHide: function() {
-      this.$container.removeClass(this.settings['activeClass']);
-      this.$container.removeClass(this.settings['positionedMenuClass']);
-      this.$menu.css('width', 'auto');
-    },
-
-    menuToggle: function() {
-      if ( this.$container.hasClass(this.settings['activeClass']) ) {
-        this.menuHide();
-      } else {
-        this.menuShow();
-      }
-    }
-
-  });
-
-  $.fn[ pluginName ] = function(options) {
-    return this.each(function() {
-      if ( !$.data(this, "plugin_" + pluginName) ) {
-        $.data(this, "plugin_" + pluginName,
-          new MultiSelect(this, options) );
-      }
-    });
-  };
-
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/multiselect/jquery.multi-select.min.js b/htdocs/includes/jquery/plugins/multiselect/jquery.multi-select.min.js
deleted file mode 100644
index 015aee2264b..00000000000
--- a/htdocs/includes/jquery/plugins/multiselect/jquery.multi-select.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-(function(c){function f(b,a){this.b=c(b);this.a=c.extend({},g,a);this.H()}var g={containerHTML:'<div class="multi-select-container">',menuHTML:'<div class="multi-select-menu">',buttonHTML:'<span class="multi-select-button">',menuItemsHTML:'<div class="multi-select-menuitems">',menuItemHTML:'<label class="multi-select-menuitem">',presetsHTML:'<div class="multi-select-presets">',activeClass:"multi-select-container--open",noneText:"-- Select --",allText:void 0,presets:void 0,positionedMenuClass:"multi-select-container--positioned",
-positionMenuWithin:void 0,viewportBottomGutter:20,menuMinHeight:200};c.extend(f.prototype,{H:function(){this.v();this.G();this.A();this.w();this.B();this.J();this.K();this.b.hide()},v:function(){if(!1===this.b.is("select[multiple]"))throw Error("$.multiSelect only works on <select multiple> elements");},G:function(){this.l=c('label[for="'+this.b.attr("id")+'"]')},A:function(){this.f=c(this.a.containerHTML);this.b.data("multi-select-container",this.f);this.f.insertAfter(this.b)},w:function(){var b=
-this;this.g=c(this.a.buttonHTML);this.g.attr({role:"button","aria-haspopup":"true",tabindex:0,"aria-label":this.l.eq(0).text()}).on("keydown.multiselect",function(a){a=a.which;13!==a&&32!==a||b.g.click()}).on("click.multiselect",function(){b.m()}).appendTo(this.f);this.b.on("change.multiselect",function(){b.o()});this.o()},o:function(){var b=[],a=[];this.b.children("option").each(function(){var d=c(this).text();b.push(d);c(this).is(":selected")&&a.push(c.trim(d))});this.g.empty();0==a.length?this.g.text(this.a.noneText):
-a.length===b.length&&this.a.allText?this.g.text(this.a.allText):this.g.text(a.join(", "))},B:function(){var b=this;this.c=c(this.a.menuHTML);this.c.attr({role:"menu"}).on("keyup.multiselect",function(a){27===a.which&&b.j()}).appendTo(this.f);this.D();this.a.presets&&this.F()},D:function(){var b=this;this.h=c(this.a.menuItemsHTML);this.c.append(this.h);this.b.on("change.multiselect",function(a,c){!0!==c&&b.s()});this.s()},s:function(){var b=this;this.h.empty();this.b.children("option").each(function(a,
-d){a=b.C(c(d),a);b.h.append(a)})},F:function(){var b=this;this.i=c(this.a.presetsHTML);this.c.prepend(this.i);c.each(this.a.presets,function(a,d){a=b.b.attr("name")+"_preset_"+a;var h=c(b.a.menuItemHTML).attr({"for":a,role:"menuitem"}).text(" "+d.name).appendTo(b.i);c("<input>").attr({type:"radio",name:b.b.attr("name")+"_presets",id:a}).prependTo(h).on("change.multiselect",function(){b.b.val(d.options);b.b.trigger("change")})});this.b.on("change.multiselect",function(){b.u()});this.u()},u:function(){var b=
-this;c.each(this.a.presets,function(a,c){a=b.b.attr("name")+"_preset_"+a;a=b.i.find("#"+a);a:{c=c.options||[];var d=b.b.val()||[];if(c.length!=d.length)c=!1;else{c.sort();d.sort();for(var e=0;e<c.length;e++)if(c[e]!==d[e]){c=!1;break a}c=!0}}c?a.prop("checked",!0):a.prop("checked",!1)})},C:function(b,a){var d=this.b.attr("name")+"_"+a;a=c(this.a.menuItemHTML).attr({"for":d,role:"menuitem"}).text(" "+b.text());d=c("<input>").attr({type:"checkbox",id:d,value:b.val()}).prependTo(a);b.is(":disabled")&&
-d.attr("disabled","disabled");b.is(":selected")&&d.prop("checked","checked");d.on("change.multiselect",function(){c(this).prop("checked")?b.prop("selected",!0):b.prop("selected",!1);b.trigger("change",[!0])});return a},J:function(){var b=this;c("html").on("click.multiselect",function(){b.j()});this.f.on("click.multiselect",function(a){a.stopPropagation()})},K:function(){var b=this;this.l.on("click.multiselect",function(a){a.preventDefault();a.stopPropagation();b.m()})},I:function(){c("html").trigger("click.multiselect");
-this.f.addClass(this.a.activeClass);if(this.a.positionMenuWithin&&this.a.positionMenuWithin instanceof c){var b=this.c.offset().left+this.c.outerWidth(),a=this.a.positionMenuWithin.offset().left+this.a.positionMenuWithin.outerWidth();b>a&&(this.c.css("width",a-this.c.offset().left),this.f.addClass(this.a.positionedMenuClass))}b=this.c.offset().top+this.c.outerHeight();a=c(window).scrollTop()+c(window).height();b>a-this.a.viewportBottomGutter?this.c.css({maxHeight:Math.max(a-this.a.viewportBottomGutter-
-this.c.offset().top,this.a.menuMinHeight),overflow:"scroll"}):this.c.css({maxHeight:"",overflow:""})},j:function(){this.f.removeClass(this.a.activeClass);this.f.removeClass(this.a.positionedMenuClass);this.c.css("width","auto")},m:function(){this.f.hasClass(this.a.activeClass)?this.j():this.I()}});c.fn.multiSelect=function(b){return this.each(function(){c.data(this,"plugin_multiSelect")||c.data(this,"plugin_multiSelect",new f(this,b))})}})(jQuery);
diff --git a/htdocs/install/doctemplates/websites/website_template-stellar.jpg b/htdocs/install/doctemplates/websites/website_template-stellar.jpg
index 66867384b58..9e8251b1deb 100644
Binary files a/htdocs/install/doctemplates/websites/website_template-stellar.jpg and b/htdocs/install/doctemplates/websites/website_template-stellar.jpg differ
diff --git a/htdocs/install/doctemplates/websites/website_template-stellar.zip b/htdocs/install/doctemplates/websites/website_template-stellar.zip
index f3ed48c6729..750d39d36d9 100644
Binary files a/htdocs/install/doctemplates/websites/website_template-stellar.zip and b/htdocs/install/doctemplates/websites/website_template-stellar.zip differ
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index 6a31fa3e745..96ac938883c 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -48,9 +48,19 @@ UPDATE llx_c_units SET label = 'SurfaceUnitm2' WHERE code IN ('M2');
 
 ALTER TABLE llx_adherent_type ADD UNIQUE INDEX uk_adherent_type_libelle (libelle, entity);
 
+ALTER TABLE llx_mailing_cibles MODIFY COLUMN lastname varchar(160);
+ALTER TABLE llx_mailing_cibles MODIFY COLUMN firstname varchar(160);
+
+ALTER TABLE llx_emailcollector_emailcollector ADD COLUMN login varchar(128);
+ALTER TABLE llx_emailcollector_emailcollector ADD COLUMN codelastresult varchar(16);
+ALTER TABLE llx_emailcollector_emailcollectoraction ADD COLUMN position integer DEFAULT 0;
+
+
 
 -- For v11
 
+ALTER TABLE llx_c_email_senderprofile MODIFY COLUMN active tinyint DEFAULT 1 NOT NULL;
+ 
 insert into llx_c_type_container (code,label,module,active) values ('menu',     'Menu',     'system', 1);
 
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('HELP',    '15', 'Request for functionnal help',  1, 0, NULL);
@@ -498,3 +508,30 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663);
 
 ALTER TABLE llx_comment ADD COLUMN fk_user_modif  integer DEFAULT NULL;
+
+
+CREATE TABLE llx_mrp_production(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	fk_mo integer NOT NULL, 
+	position integer NOT NULL DEFAULT 0,
+	fk_product integer NOT NULL, 
+	fk_warehouse integer,
+	qty integer NOT NULL DEFAULT 1,
+	batch varchar(30),
+	role varchar(10),      			-- 'toconsume' or 'toproduce' (initialized at MO creation), 'consumed' or 'produced' (added after MO validation)
+	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
+	fk_stock_movement integer,		-- id of stock movement when movements are validated
+	date_creation datetime NOT NULL, 
+	tms timestamp, 
+	fk_user_creat integer NOT NULL, 
+	fk_user_modif integer, 
+	import_key varchar(14)
+) ENGINE=innodb;
+
+ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_mo FOREIGN KEY (fk_mo) REFERENCES llx_mrp_mo (rowid);
+ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
+ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_stock_movement FOREIGN KEY (fk_stock_movement) REFERENCES llx_stock_mouvement (rowid);
+
+ALTER TABLE llx_mrp_production ADD INDEX idx_mrp_production_fk_mo (fk_mo);
+
+ALTER TABLE llx_emailcollector_emailcollector ADD UNIQUE INDEX uk_emailcollector_emailcollector_ref(ref, entity);
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
old mode 100755
new mode 100644
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
old mode 100755
new mode 100644
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
old mode 100755
new mode 100644
diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index 4bb083ab797..a56cb45e4fe 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -328,6 +328,9 @@ UPDATE llx_c_shipment_mode SET label = 'https://www.laposte.fr/outils/suivre-vos
 UPDATE llx_c_shipment_mode SET label = 'https://www.laposte.fr/outils/suivre-vos-envois?code={TRACKID}' WHERE code IN ('LETTREMAX');
 
 
+-- VMYSQL4.3 ALTER TABLE llx_holiday MODIFY COLUMN ref varchar(30) NULL;
+-- VPGSQL8.2 ALTER TABLE llx_holiday ALTER COLUMN ref DROP NOT NULL;
+
 
 create table llx_reception
 (
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
old mode 100755
new mode 100644
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index f851061db63..cf1c3334092 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -17,7 +17,7 @@
 --
 -- ============================================================================
 
-CREATE TABLE llx_accounting_bookkeeping 
+CREATE TABLE llx_accounting_bookkeeping
 (
   rowid                 integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
   entity                integer DEFAULT 1 NOT NULL,	-- 					| multi company id
@@ -27,7 +27,7 @@ CREATE TABLE llx_accounting_bookkeeping
   doc_ref               varchar(300) NOT NULL,		-- FEC:PieceRef		| facture_client/reglement_client/... reference number
   fk_doc                integer NOT NULL,			-- 					| facture_client/reglement_client/... rowid
   fk_docdet             integer NOT NULL,			-- 					| facture_client/reglement_client/... line rowid
-  thirdparty_code       varchar(32),                -- Third party code (customer or supplier) when record is saved (may help debug) 
+  thirdparty_code       varchar(32),                -- Third party code (customer or supplier) when record is saved (may help debug)
   subledger_account     varchar(32),				-- FEC:CompAuxNum	| account number of subledger account
   subledger_label       varchar(255),				-- FEC:CompAuxLib	| label of subledger account
   numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
@@ -45,12 +45,12 @@ CREATE TABLE llx_accounting_bookkeeping
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification 
+  tms                   timestamp,					--					| date last modification
   fk_user               integer NULL,               -- The id of user that validate the accounting source document
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
-  date_validated        datetime,					-- FEC:ValidDate	| if empty: movement not validated / if not empty: movement validated (No deleting / No modification) 
-  date_export	      		datetime DEFAULT NULL,		--
+  date_validated        datetime,					-- FEC:ValidDate	| if empty: movement not validated / if not empty: movement validated (No deleting / No modification)
+  date_export	      	datetime DEFAULT NULL,		--
   import_key            varchar(14),
-  extraparams	          varchar(255)				-- for other parameters with json format
+  extraparams           varchar(255)				-- for other parameters with json format
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.key.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.key.sql
index b7b9ea96a2c..d2a8b2fcb87 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.key.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.key.sql
@@ -19,7 +19,5 @@ ALTER TABLE llx_emailcollector_emailcollector ADD INDEX idx_emailcollector_entit
 ALTER TABLE llx_emailcollector_emailcollector ADD INDEX idx_emailcollector_status (status);
 -- END MODULEBUILDER INDEXES
 
---ALTER TABLE llx_emailcollector_emailcollector ADD UNIQUE INDEX uk_emailcollector_emailcollector_fieldxyz(fieldx, fieldy);
-
---ALTER TABLE llx_emailcollector_emailcollector ADD CONSTRAINT llx_emailcollector_emailcollector_field_id FOREIGN KEY (fk_field) REFERENCES llx_myotherobject(rowid);
+ALTER TABLE llx_emailcollector_emailcollector ADD UNIQUE INDEX uk_emailcollector_emailcollector_ref(ref, entity);
 
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.key.sql b/htdocs/install/mysql/tables/llx_mrp_production.key.sql
new file mode 100644
index 00000000000..d77ef297e82
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_mrp_production.key.sql
@@ -0,0 +1,21 @@
+-- Copyright (C) 2019      Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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 http://www.gnu.org/licenses/.
+
+ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_mo FOREIGN KEY (fk_mo) REFERENCES llx_mrp_mo (rowid);
+ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
+ALTER TABLE llx_mrp_production ADD CONSTRAINT fk_mrp_production_stock_movement FOREIGN KEY (fk_stock_movement) REFERENCES llx_stock_mouvement (rowid);
+
+ALTER TABLE llx_mrp_production ADD INDEX idx_mrp_production_fk_mo (fk_mo);
+
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.sql b/htdocs/install/mysql/tables/llx_mrp_production.sql
new file mode 100644
index 00000000000..275acde6aef
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_mrp_production.sql
@@ -0,0 +1,34 @@
+-- Copyright (C) 2019      Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- 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 http://www.gnu.org/licenses/.
+
+
+CREATE TABLE llx_mrp_production(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	fk_mo integer NOT NULL, 
+	position integer NOT NULL DEFAULT 0,
+	fk_product integer NOT NULL, 
+	fk_warehouse integer,
+	qty integer NOT NULL DEFAULT 1,
+	batch varchar(30),
+	role varchar(10),      			-- 'toconsume' or 'toproduce' (initialized at MO creation), 'consumed' or 'produced' (added after MO validation)
+	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
+	fk_stock_movement integer,		-- id of stock movement when movements are validated
+	date_creation datetime NOT NULL, 
+	tms timestamp, 
+	fk_user_creat integer NOT NULL, 
+	fk_user_modif integer, 
+	import_key varchar(14)
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_product_batch.sql b/htdocs/install/mysql/tables/llx_product_batch.sql
index 70b7d024398..ba8b7ff59e4 100644
--- a/htdocs/install/mysql/tables/llx_product_batch.sql
+++ b/htdocs/install/mysql/tables/llx_product_batch.sql
@@ -17,6 +17,7 @@
 --
 -- This table is dedicated to store detail (lots/serial) of a stock
 -- ============================================================================
+
 CREATE TABLE llx_product_batch (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
   tms timestamp,
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e7685ef25b9..096a710bee8 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -844,10 +844,10 @@ Permission1002=Create/modify warehouses
 Permission1003=Delete warehouses
 Permission1004=Read stock movements
 Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
+Permission1101=Read delivery receipts
+Permission1102=Create/modify delivery receipts
+Permission1104=Validate delivery receipts
+Permission1109=Delete delivery receipts
 Permission1121=Read supplier proposals
 Permission1122=Create/modify supplier proposals
 Permission1123=Validate supplier proposals
@@ -1905,8 +1905,8 @@ CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Tracking ID found
-WithoutDolTrackingID=Dolibarr Tracking ID not found
+WithDolTrackingID=Dolibarr Reference found in Message ID
+WithoutDolTrackingID=Dolibarr Reference not found in Message ID
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
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/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 44e78324abf..10c536e0d48 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commercial
-CommercialArea=Commercial area
+Commercial=Commerce
+CommercialArea=Commerce area
 Customer=Customer
 Customers=Customers
 Prospect=Prospect
diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index 778cb3332ad..1f48c01de75 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=Delivery
 DeliveryRef=Ref Delivery
 DeliveryCard=Receipt card
-DeliveryOrder=Delivery order
+DeliveryOrder=Delivery receipt
 DeliveryDate=Delivery date
 CreateDeliveryOrder=Generate delivery receipt
 DeliveryStateSaved=Delivery state saved
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index d14aa8a3c71..c808aac4cb7 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example: preg_match('/public/', $_SERVER['PHP_SELF'])?0:1
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index c754d411408..2fa68d36061 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -49,4 +49,6 @@ DisableStockChangeHelp=When this flag is set, there is no stock change on this p
 BomAndBomLines=Bills Of Material and lines
 BOMLine=Line of BOM
 WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
\ No newline at end of file
+CreateMO=Create MO
+ToConsume=A consommer
+Manufactured=Fabriqué
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 18dc7faaeb9..ecee37908ce 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -214,4 +214,4 @@ StockIncrease=Stock increase
 StockDecrease=Stock decrease
 InventoryForASpecificWarehouse=Inventory for a specific warehouse
 InventoryForASpecificProduct=Inventory for a specific product
-
+StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 3e623433db8..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
@@ -553,7 +553,7 @@ if (!defined('NOLOGIN'))
 		// Validation of login/pass/entity
 		// If ok, the variable login will be returned
 		// If error, we will put error message in session under the name dol_loginmesg
-		if ($test && $goontestloop && GETPOST('action', 'aZ09') == 'login')
+		if ($test && $goontestloop && GETPOST('actionlogin', 'aZ09') == 'login')
 		{
 			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
 			if ($login)
@@ -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').", showing the login form and exit");
+			// 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;
 				}
 			}
@@ -1426,10 +1426,6 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
             	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
-            }
-            if (! defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes
-            {
-            	print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
 		}
 
@@ -1465,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";
 		            }
 	            }
         	}
@@ -1617,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)) {
@@ -1634,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
@@ -1691,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>';
 
@@ -1756,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">
@@ -1880,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 -->
@@ -1923,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>
@@ -1988,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>
@@ -2118,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(){
@@ -2176,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;
@@ -2231,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>';
@@ -2389,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
@@ -2468,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]);
@@ -2559,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/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 68eec5513a9..a3a503e702b 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2480,7 +2480,7 @@ elseif (! empty($module))
 							print '<div class="div-table-responsive">';
 							print '<table class="noborder">';
 							print '<tr class="liste_titre">';
-							print '<th class="liste_titre">'.$langs->trans("Property");
+							print '<th>'.$langs->trans("Property");
 							print ' (<a class="" href="https://wiki.dolibarr.org/index.php/Language_and_development_rules#Table_and_fields_structures" target="_blank">'.$langs->trans("SeeExamples").'</a>)';
 							print '</th>';
 							print '<th>';
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index efb3013bd6d..bb9f8eda4e0 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -64,7 +64,7 @@ class MyObject extends CommonObject
 
 
 	/**
-	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float')
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
 	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 	 *  'label' the translation key.
 	 *  'enabled' is a condition when the field must be managed.
@@ -94,7 +94,7 @@ class MyObject extends CommonObject
 		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
 	    'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20),
 	    'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth200', 'help'=>'Help text', 'showoncombobox'=>1),
-	    'amount'        =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
+	    'amount'        =>array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
 	    'qty'           =>array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
 	    'fk_soc' 		=>array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
 		'fk_project'    =>array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1),
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 69583f8c555..db6462eb90a 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -68,37 +68,37 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main","companies"));
+        $langs->loadLangs(array("main", "companies"));
 
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
-		$this->scandir = 'MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH';	// Name of constant that is used to save list of directories to scan
+		$this->scandir = 'MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Page size for A4 format
 		$this->type = 'odt';
 		$this->page_largeur = 0;
 		$this->page_hauteur = 0;
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=0;
-		$this->marge_droite=0;
-		$this->marge_haute=0;
-		$this->marge_basse=0;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
 
-		$this->option_logo = 1;                    // Affiche logo
-		$this->option_tva = 0;                     // Gere option tva COMMANDE_TVAOPTION
-		$this->option_modereg = 0;                 // Affiche mode reglement
-		$this->option_condreg = 0;                 // Affiche conditions reglement
-		$this->option_codeproduitservice = 0;      // Affiche code produit-service
-		$this->option_multilang = 1;               // Dispo en plusieurs langues
-		$this->option_escompte = 0;                // Affiche si il y a eu escompte
-		$this->option_credit_note = 0;             // Support credit notes
-		$this->option_freetext = 1;				   // Support add of a personalised text
-		$this->option_draft_watermark = 0;		   // Support add of a watermark on drafts
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
 		// Recupere emetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang, -2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
@@ -110,83 +110,83 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 	 */
     public function info($langs)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("errors","companies"));
+        $langs->loadLangs(array("errors", "companies"));
 
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="setModuleOptions">';
-		$texte.= '<input type="hidden" name="param1" value="MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
-		$texte.= '<tr><td>';
-		$texttitle=$langs->trans("ListOfDirectories");
-		$listofdir=explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH)));
-		$listoffiles=array();
-		foreach($listofdir as $key=>$tmpdir)
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key=>$tmpdir)
 		{
-			$tmpdir=trim($tmpdir);
-			$tmpdir=preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
-			if (! $tmpdir) {
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
 			else
 			{
-				$tmpfiles=dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles=array_merge($listoffiles, $tmpfiles);
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
 		}
-		$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
 		// Add list of substitution keys
-		$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
-		$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation");    // This contains an url, we don't modify it
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
 
-		$texte.= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
-		$texte.= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
-		$texte.= '<textarea class="flat" cols="60" name="value1">';
-		$texte.=$conf->global->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH;
-		$texte.= '</textarea>';
-		$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
-		$texte.= '<br></div></div>';
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
 
 		// Scan directories
-		$nbofiles=count($listoffiles);
-		if (! empty($conf->global->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH))
 		{
-			$texte.=$langs->trans("NumberOfModelFilesFound").': <b>';
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
-			$texte.=count($listoffiles);
+			$texte .= count($listoffiles);
 			//$texte.=$nbofiles?'</a>':'';
-			$texte.='</b>';
+			$texte .= '</b>';
 		}
 
 		if ($nbofiles)
 		{
-   			$texte.='<div id="div_'.get_class($this).'" class="hidden">';
-   			foreach($listoffiles as $file)
+   			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+   			foreach ($listoffiles as $file)
    			{
-                $texte.=$file['name'].'<br>';
+                $texte .= $file['name'].'<br>';
    			}
-   			$texte.='<div id="div_'.get_class($this).'">';
+   			$texte .= '<div id="div_'.get_class($this).'">';
 		}
 
-		$texte.= '</td>';
+		$texte .= '</td>';
 
-		$texte.= '<td valign="top" rowspan="2" class="hideonsmartphone">';
-		$texte.= $langs->trans("ExampleOfDirectoriesForModelGen");
-		$texte.= '</td>';
-		$texte.= '</tr>';
+		$texte .= '<td valign="top" rowspan="2" class="hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
 	}
@@ -206,7 +206,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
     public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
         // phpcs:enable
-		global $user,$langs,$conf,$mysoc,$hookmanager;
+		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -215,28 +215,28 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		}
 
 		// Add odtgeneration hook
-		if (! is_object($hookmanager))
+		if (!is_object($hookmanager))
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
+			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		$sav_charset_output=$outputlangs->charset_output;
-		$outputlangs->charset_output='UTF-8';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
 		if ($conf->commande->dir_output)
 		{
 			// If $object is id instead of object
-			if (! is_object($object))
+			if (!is_object($object))
 			{
 				$id = $object;
 				$object = new Commande($this->db);
-				$result=$object->fetch($id);
+				$result = $object->fetch($id);
 				if ($result < 0)
 				{
 					dol_print_error($this->db, $object->error);
@@ -244,16 +244,16 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				}
 			}
 
-			$dir = $conf->commande->multidir_output[isset($object->entity)?$object->entity:1];
+			$dir = $conf->commande->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (! preg_match('/specimen/i', $objectref)) $dir.= "/" . $objectref;
-			$file = $dir . "/" . $objectref . ".odt";
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -261,25 +261,25 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 			if (file_exists($dir))
 			{
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
-				$newfile=basename($srctemplatepath);
-				$newfiletmp=preg_replace('/\.od(t|s)/i', '', $newfile);
-				$newfiletmp=preg_replace('/template_/i', '', $newfiletmp);
-				$newfiletmp=preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp=$objectref.'_'.$newfiletmp;
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
-				$newfileformat=substr($newfile, strrpos($newfile, '.')+1);
-				if ( ! empty($conf->global->MAIN_DOC_USE_TIMING))
+				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
-				    $format=$conf->global->MAIN_DOC_USE_TIMING;
-				    if ($format == '1') $format='%Y%m%d%H%M%S';
-					$filename=$newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+				    $format = $conf->global->MAIN_DOC_USE_TIMING;
+				    if ($format == '1') $format = '%Y%m%d%H%M%S';
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				}
 				else
 				{
-					$filename=$newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file=$dir.'/'.$filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -289,20 +289,20 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 
 
 				// If CUSTOMER contact defined on order, we use it
-				$usecontact=false;
-				$arrayidcontact=$object->getIdContact('external', 'CUSTOMER');
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 				if (count($arrayidcontact) > 0)
 				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				$contactobject=null;
-				if (! empty($usecontact))
+				$contactobject = null;
+				if (!empty($usecontact))
 				{
 					// On peut utiliser le nom de la societe du contact
-					if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
+					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact;
 					else {
                         $socobject = $object->thirdparty;
                			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
@@ -311,11 +311,11 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				}
 				else
 				{
-					$socobject=$object->thirdparty;
+					$socobject = $object->thirdparty;
 				}
 
 				// Make substitution
-				$substitutionarray=array(
+				$substitutionarray = array(
 				'__FROM_NAME__' => $this->emetteur->name,
 				'__FROM_EMAIL__' => $this->emetteur->email,
 				'__TOTAL_TTC__' => $object->total_ttc,
@@ -324,15 +324,15 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$substitutionarray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$substitutionarray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Line of free text
-				$newfreetext='';
-				$paramfreetext='ORDER_FREE_TEXT';
-				if (! empty($conf->global->$paramfreetext))
+				$newfreetext = '';
+				$paramfreetext = 'ORDER_FREE_TEXT';
+				if (!empty($conf->global->$paramfreetext))
 				{
-					$newfreetext=make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
 				// Open and load template
@@ -342,15 +342,15 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						$srctemplatepath,
 						array(
 						'PATH_TO_TMP'	  => $conf->commande->dir_temp,
-						'ZIP_PROXY'		  => 'PclZipProxy',	// PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
 				}
@@ -365,31 +365,31 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Define substitution array
 				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-				$array_object_from_properties=$this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet=$this->get_substitutionarray_object($object, $outputlangs);
-				$array_user=$this->get_substitutionarray_user($user, $outputlangs);
-				$array_soc=$this->get_substitutionarray_mysoc($mysoc, $outputlangs);
-				$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject, $outputlangs);
-				$array_other=$this->get_substitutionarray_other($outputlangs);
+				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet = $this->get_substitutionarray_object($object, $outputlangs);
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact=$this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
 				// Call the ODTSubstitution hook
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach($tmparray as $key=>$value)
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						if (preg_match('/logo$/', $key)) // Image
@@ -402,7 +402,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -414,7 +414,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					try {
 						$listlines = $odfHandler->setSegment('lines');
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -424,22 +424,22 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					{
 						foreach ($object->lines as $line)
 						{
-							$tmparray=$this->get_substitutionarray_lines($line, $outputlangs);
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
-							$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray,'line'=>$line);
-							$reshook=$hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
-							foreach($tmparray as $key => $val)
+							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
+							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+							foreach ($tmparray as $key => $val)
 							{
 								try
 								{
 									$listlines->setVars($key, $val, true, 'UTF-8');
 								}
-								catch(OdfException $e)
+								catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
-								catch(SegmentException $e)
+								catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -449,21 +449,21 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						$odfHandler->mergeSegment($listlines);
 					}
 				}
-				catch(OdfException $e)
+				catch (OdfException $e)
 				{
-					$this->error=$e->getMessage();
+					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
 				}
 
 				// Replace labels translated
-				$tmparray=$outputlangs->get_translations_for_substitutions();
-				foreach($tmparray as $key=>$value)
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					}
-					catch(OdfException $e)
+					catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -471,15 +471,15 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 
 				// Call the beforeODTSave hook
 
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Write new file
 				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
-					}catch (Exception $e){
-                        $this->error=$e->getMessage();
+					} catch (Exception $e) {
+                        $this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
@@ -488,27 +488,27 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
-                        $this->error=$e->getMessage();
+                        $this->error = $e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
 
-				$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);
-				$reshook=$hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-				$odfHandler=null;	// Destroy object
+				$odfHandler = null; // Destroy object
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Success
+				return 1; // Success
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}
diff --git a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
index c0b2e073ad0..aeabc4a95db 100644
--- a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
+++ b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
@@ -50,7 +50,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
 	<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
     <td class="right"><?php echo ''; ?></td>
 	<td class="right"><?php echo $objectlink->getLibStatut(7); ?></td>
-	<td class="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
 	<?php
 }
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 4a077e35b5b..e607cdfebb4 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -89,7 +89,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity]."/".$object->id;
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $object->id);
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 7c4fa1ebbdc..fd4e0435dbc 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -100,17 +100,17 @@ if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
 //$result = restrictedArea($user, 'mymodule', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
 $permissiontoread = $user->rights->mymodule->myobject->read;
-$permissiontoadd = $user->rights->mymodule->myobject->write; 	// Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->mymodule->myobject->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$permissionnote = $user->rights->mymodule->myobject->write;		// Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->mymodule->myobject->write;	// Used by the include of actions_dellink.inc.php
-$upload_dir = $conf->mymodule->multidir_output[isset($object->entity)?$object->entity:1];
+$permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->mymodule->myobject->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
 /*
@@ -392,29 +392,29 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 * Lines
 	 */
 
-	if (! empty($object->table_element_line))
+	if (!empty($object->table_element_line))
 	{
     	// Show object lines
     	$result = $object->getLinesArray();
 
-    	print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#addline' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
-    	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
-    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+    	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+    	<input type="hidden" name="token" value="' . $_SESSION ['newtoken'].'">
+    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
-    	<input type="hidden" name="id" value="' . $object->id . '">
+    	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
-    	if (! empty($conf->use_javascript_ajax) && $object->status == 0) {
-    	    include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+    	if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+    	    include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
     	}
 
     	print '<div class="div-table-responsive-no-min">';
-    	if (! empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+    	if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
     	{
     	    print '<table id="tablelines" class="noborder noshadow" width="100%">';
     	}
 
-    	if (! empty($object->lines))
+    	if (!empty($object->lines))
     	{
     		$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
     	}
@@ -432,7 +432,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	    }
     	}
 
-    	if (! empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+    	if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
     	{
     	    print '</table>';
     	}
@@ -446,21 +446,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($action != 'presend' && $action != 'editline') {
     	print '<div class="tabsAction">'."\n";
-    	$parameters=array();
-    	$reshook=$hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+    	$parameters = array();
+    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
     	if (empty($reshook))
     	{
     	    // Send
-            print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
+            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
 
             // Back to draft
             if ($object->status == $object::STATUS_VALIDATED)
             {
 	            if ($permissiontoadd)
 	            {
-	            	print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=setdraft">' . $langs->trans("SetToDraft") . '</a>';
+	            	print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft">'.$langs->trans("SetToDraft").'</a>';
 	            }
             }
 
@@ -493,7 +493,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		// Clone
     		if ($permissiontoadd)
     		{
-    			print '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&socid=' . $object->socid . '&action=clone&object=myobject">' . $langs->trans("ToClone") . '</a>'."\n";
+    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=myobject">'.$langs->trans("ToClone").'</a>'."\n";
     		}
 
     		/*
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 5a58a068a64..a712783f55e 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -80,7 +80,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 if ($id > 0 || !empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".dol_sanitizeFileName($object->ref);
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $object->id);
 
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index f7440c71cf8..fe2919ea7a0 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -59,7 +59,7 @@ $hookmanager->initHooks(array('myobjectnote', 'globalcard')); // Note that conf-
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $id);
 
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 884bc234cbf..7009915eec1 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -54,7 +54,7 @@ else
 $search_agenda_label=GETPOST('search_agenda_label');
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mrp', $id);
 
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 1408162b111..7fe93d795a1 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -100,7 +100,7 @@ if (GETPOST('fk_bom', 'int'))
 }
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
 //$result = restrictedArea($user, 'mrp', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
@@ -109,7 +109,7 @@ $permissionnote = $user->rights->mrp->write; // Used by the include of actions_s
 $permissiondellink = $user->rights->mrp->write; // Used by the include of actions_dellink.inc.php
 $permissiontoadd = $user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$upload_dir = $conf->mrp->multidir_output[isset($object->entity)?$object->entity:1];
+$upload_dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
 /*
@@ -251,7 +251,10 @@ if ($action == 'create')
 						}
 					});*/
 				}
-				else {
+				else if (jQuery('#fk_bom').val() < 0) {
+					// Redirect to page with all fields defined except fk_bom set
+					console.log(jQuery('#fk_product').val());
+					window.location.href = '<?php echo $_SERVER["PHP_SELF"] ?>?action=create&qty='+jQuery('#qty').val()+'&fk_product='+jQuery('#fk_product').val()+'&label='+jQuery('#label').val()+'&fk_project='+jQuery('#fk_project').val()+'&fk_warehouse='+jQuery('#fk_warehouse').val();
 					/*
 					$('#qty').val('');
 					$("#fk_product").val('');
@@ -275,15 +278,19 @@ if ($action == 'create')
 	print '<input type="'.($backtopage ? "submit" : "button").'" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
-	print load_fiche_titre($langs->trans("ToConsume"));
+	if (GETPOST('fk_bom', 'int') > 0) {
+		print load_fiche_titre($langs->trans("ToConsume"));
 
-	print '<table class="noborder centpercent">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
 
-	$object->lines = $objectbom->lines;
+		$object->lines = $objectbom->lines;
 
-	$object->printOriginLinesList('', array());
+		$object->printOriginLinesList('', array());
 
-	print '</table>';
+		print '</table>';
+		print '</div>';
+	}
 
 	print '</form>';
 }
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 72fab7c3517..eae4daf67c9 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -41,7 +41,7 @@ $id=(GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
 $ref = GETPOST('ref', 'alpha');
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mrp', $id);
 
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index aeb4630168d..1a9fbe278a9 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -47,7 +47,7 @@ $hookmanager->initHooks(array('monote','globalcard'));     // Note that conf->ho
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mrp', $id);
 
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 2b63065f72c..45507e44928 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -88,7 +88,7 @@ if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
 //$result = restrictedArea($user, 'mrp', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
@@ -97,7 +97,7 @@ $permissionnote = $user->rights->mrp->write; // Used by the include of actions_s
 $permissiondellink = $user->rights->mrp->write; // Used by the include of actions_dellink.inc.php
 $permissiontoadd = $user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->mrp->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$upload_dir = $conf->mrp->multidir_output[isset($object->entity)?$object->entity:1];
+$upload_dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
 /*
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index a5793cc66c8..db6b60172be 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1146,7 +1146,7 @@ else
         }
 
         // Other attributes
-        $parameters = array('colspan' => 3);
+        $parameters = array('colspan' => 3, 'cols' => '3');
         $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
         if (empty($reshook))
@@ -1528,12 +1528,12 @@ else
         	}
 
             // Other attributes
-            $parameters = array('colspan' => ' colspan="3"', 'cols'=>3);
+            $parameters = array('colspan' => ' colspan="3"', 'cols' => 3);
             $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
             if (empty($reshook))
             {
-            	print $object->showOptionals($extrafields, 'edit');
+            	print $object->showOptionals($extrafields, 'edit', $parameters);
             }
 
 			// Tags-Categories
@@ -1976,7 +1976,7 @@ else
         	}
 
             // Other attributes
-            $parameters = array('colspan' => ' colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'"');
+        	$parameters = array('colspan' => ' colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'"', 'cols' => (2 + (($showphoto || $showbarcode) ? 1 : 0)));
             include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
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/class/product.class.php b/htdocs/product/class/product.class.php
index 745b4be9c4b..e99d4e46420 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2684,12 +2684,13 @@ class Product extends CommonObject
     /**
      *  Charge tableau des stats expedition client pour le produit/service
      *
-     * @param  int    $socid           Id societe pour filtrer sur une societe
-     * @param  string $filtrestatut    Id statut pour filtrer sur un statut
-     * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
-     * @return array                   Tableau des stats
+     * @param   int         $socid                  Id societe pour filtrer sur une societe
+     * @param   string      $filtrestatut           Id statut pour filtrer sur un statut
+     * @param   int         $forVirtualStock        Ignore rights filter for virtual stock calculation.
+     * @param   string      $filterShipmentStatus   [=''] Ids shipment status separated by comma
+     * @return  int         <0 if KO, >0 if OK (Tableau des stats)
      */
-    public function load_stats_sending($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
+    public function load_stats_sending($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $filterShipmentStatus = '')
     {
         // phpcs:enable
         global $conf,$user;
@@ -2719,6 +2720,7 @@ class Product extends CommonObject
         if ($filtrestatut <> '') {
             $sql.= " AND c.fk_statut in (".$filtrestatut.")";
         }
+        if (!empty($filterShipmentStatus)) $sql.= " AND e.fk_statut IN (" . $filterShipmentStatus . ")";
 
         $result = $this->db->query($sql);
         if ($result ) {
@@ -4680,7 +4682,14 @@ class Product extends CommonObject
 		}
 		if (!empty($conf->expedition->enabled))
 		{
-			$result = $this->load_stats_sending(0, '1,2', 1);
+            require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+            $filterShipmentStatus = '';
+            if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+                $filterShipmentStatus = Expedition::STATUS_VALIDATED  . ',' . Expedition::STATUS_CLOSED;
+            } elseif (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+                $filterShipmentStatus = Expedition::STATUS_CLOSED;
+            }
+			$result = $this->load_stats_sending(0, '1,2', 1, $filterShipmentStatus);
 			if ($result < 0) dol_print_error($this->db, $this->error);
 			$stock_sending_client = $this->stats_expedition['qty'];
 		}
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 43821b99b31..09949ee3791 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -72,7 +72,7 @@ if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $id);
 
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 4ee108595e6..7010190fd14 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -72,7 +72,7 @@ if (empty($action) && empty($id) && empty($ref)) $action='view';
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once.
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $id);
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 2fd5f950e4d..6609d6c3968 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1274,7 +1274,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '</td>';
 		print '</tr>';
 
-		$parameters = array('colspan' => 2);
+		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
 		print '</table>';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 6f8c5648275..034e0076f09 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -721,12 +721,12 @@ else
 			print '</td></tr>';
 
             // Other attributes
-            $parameters = array('colspan' => ' colspan="3"', 'cols'=>3);
+            $parameters = array('colspan' => ' colspan="3"', 'cols' => '3');
             $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
             if (empty($reshook))
             {
-                print $object->showOptionals($extrafields, 'edit');
+                print $object->showOptionals($extrafields, 'edit', $parameters);
             }
 			// Tags-Categories
 			if ($conf->categorie->enabled)
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index d1c81ff7251..e6f288d2a52 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -661,8 +661,15 @@ if ($id > 0 || $ref)
 
 			// Number of product from customer order already sent (partial shipping)
 			if (!empty($conf->expedition->enabled)) {
+                require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+                $filterShipmentStatus = '';
+                if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+                    $filterShipmentStatus = Expedition::STATUS_VALIDATED  . ',' . Expedition::STATUS_CLOSED;
+                } elseif (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+                    $filterShipmentStatus = Expedition::STATUS_CLOSED;
+                }
 				if ($found) $helpondiff .= '<br>'; else $found = 1;
-				$result = $object->load_stats_sending(0, '2', 1);
+				$result = $object->load_stats_sending(0, '2', 1, $filterShipmentStatus);
 				$helpondiff .= $langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
 			}
 
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 13f7cca301f..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,9 +53,9 @@ $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;
-$sortfield = GETPOST("sortfield");
-$sortorder = GETPOST("sortorder");
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
 if (!$sortorder) $sortorder = 'DESC';
 if (!$sortfield) $sortfield = 'cf.date_creation';
 $page = GETPOST('page', 'int') ? GETPOST('page', 'int') : 0;
@@ -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 32ffebdba76..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");
-$sortorder = GETPOST("sortorder");
-if (! $sortfield) $sortfield="e.ref";
-if (! $sortorder) $sortorder="ASC";
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+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 e6d35f5ee9e..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");
-$page = GETPOST("page");
+$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/projet/list.php b/htdocs/projet/list.php
index d5c37b81fa6..63240e9f842 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -61,8 +61,8 @@ $diroutputmassaction = $conf->projet->dir_output.'/temp/massgeneration/'.$user->
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder");
-$page = GETPOST("page");
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 $page = is_numeric($page) ? $page : 0;
 $page = $page == -1 ? 0 : $page;
 if (!$sortfield) $sortfield = "p.ref";
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index d76ee06ab5a..4989e0484a2 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -864,7 +864,7 @@ if ($action == 'create')
             print "</td></tr>\n";
 
             // Other attributes
-            $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
+            $parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid'=>$socid);
             $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $recept, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
 
@@ -875,7 +875,7 @@ if ($action == 'create')
 				if ($object->fetch_optionals() > 0) {
 					$recept->array_options = array_merge($recept->array_options, $object->array_options);
 				}
-				print $object->showOptionals($extrafields, 'edit');
+				print $object->showOptionals($extrafields, 'edit', $parameters);
 			}
 
             // Incoterms
@@ -1180,9 +1180,7 @@ if ($action == 'create')
 
 					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
 
-					print '<tr class="oddeven">';
 					print $line->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), $indiceAsked);
-					print '</tr>';
 				}
 
                 $indiceAsked++;
@@ -1989,7 +1987,7 @@ elseif ($id || $ref)
 				$colspan = empty($conf->productbatch->enabled) ? 8 : 9;
 				$line = new CommandeFournisseurDispatch($db);
 				$line->fetch_optionals($lines[$i]->id);
-				print '<tr class="oddeven">';
+
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
 					print $line->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
@@ -1998,7 +1996,6 @@ elseif ($id || $ref)
 				{
 					print $line->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 				}
-				print '</tr>';
 			}
 		}
 
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index e4bae7558d1..0de915f8c0a 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -67,7 +67,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     	// For now, receptions must stay linked to order, so link is not deletable
     	if ($object->element != 'order_supplier') {
     		?>
-    		<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
+    		<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
     	}
     	?>
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 98f30ac22db..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;
-$page = GETPOST("page");
+$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/societe/card.php b/htdocs/societe/card.php
index cfd3e7f8b95..464f94d71cb 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1220,6 +1220,8 @@ else
 	    print $formcompany->selectProspectCustomerType($selected);
 	    print '</td>';
 
+	    if ($conf->browser->layout == 'phone') print '</tr><tr>';
+
         print '<td>'.$form->editfieldkey('CustomerCode', 'customer_code', '', $object, 0).'</td><td>';
         print '<table class="nobordernopadding"><tr><td>';
 		$tmpcode = $object->code_client;
@@ -1241,6 +1243,10 @@ else
             if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default = 1;
             print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ?GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0));
             print '</td>';
+
+
+            if ($conf->browser->layout == 'phone') print '</tr><tr>';
+
             print '<td>';
             if (!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->lire))
             {
@@ -1283,7 +1289,9 @@ else
         // Zip / Town
         print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
         print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
-        print '</td><td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
+        print '</td>';
+        if ($conf->browser->layout == 'phone') print '</tr><tr>';
+        print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
         print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
         print '</td></tr>';
 
@@ -1313,6 +1321,7 @@ else
         // Phone / Fax
         print '<tr><td>'.img_picto('', 'object_phoning').' '.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
         print '<td><input type="text" name="phone" id="phone" class="maxwidth200" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+        if ($conf->browser->layout == 'phone') print '</tr><tr>';
         print '<td>'.img_picto('', 'object_phoning_fax').' '.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
         print '<td><input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
@@ -1374,7 +1383,7 @@ else
         // }
 
         // Prof ids
-        $i = 1; $j = 0;
+        $i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
         while ($i <= 6)
         {
             $idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
@@ -1382,7 +1391,7 @@ else
             {
 	            $key = 'idprof'.$i;
 
-                if (($j % 2) == 0) print '<tr>';
+                if (($j % $NBCOLS) == 0) print '<tr>';
 
                 $idprof_mandatory = 'SOCIETE_IDPROF'.($i).'_MANDATORY';
                 print '<td>'.$form->editfieldkey($idprof, $key, '', $object, 0, 'string', '', (empty($conf->global->$idprof_mandatory) ? 0 : 1)).'</td><td>';
@@ -1401,6 +1410,7 @@ else
         print '<td>';
         print $form->selectyesno('assujtva_value', GETPOSTISSET('assujtva_value') ?GETPOST('assujtva_value', 'int') : 1, 1); // Assujeti par defaut en creation
         print '</td>';
+        if ($conf->browser->layout == 'phone') print '</tr><tr>';
         print '<td class="nowrap">'.$form->editfieldkey('VATIntra', 'intra_vat', '', $object, 0).'</td>';
         print '<td class="nowrap">';
         $s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
@@ -1462,6 +1472,7 @@ else
         print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
         if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td>';
+        if ($conf->browser->layout == 'phone') print '</tr><tr>';
         print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
         print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
         if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -1536,12 +1547,12 @@ else
 		}
 
         // Other attributes
-        $parameters = array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
+        $parameters = array('colspan' => ' colspan="3"', 'cols' => '3');
         $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
         if (empty($reshook))
         {
-        	print $object->showOptionals($extrafields, 'edit');
+        	print $object->showOptionals($extrafields, 'edit', $parameters);
         }
 
 		// Assign a sale representative
@@ -2200,12 +2211,12 @@ else
 			}
 
             // Other attributes
-            $parameters = array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
+            $parameters = array('colspan' => ' colspan="3"', 'cols' => '3');
             $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
             print $hookmanager->resPrint;
             if (empty($reshook))
             {
-            	print $object->showOptionals($extrafields, 'edit');
+            	print $object->showOptionals($extrafields, 'edit', $parameters);
             }
 
             // Webservices url/key
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 8a29d653912..c855346dbec 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -912,20 +912,20 @@ class Thirdparties extends DolibarrApi
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe', $id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -1366,7 +1366,7 @@ class Thirdparties extends DolibarrApi
 		foreach ($accounts as $account) {
 			$object = array();
 			foreach ($account as $key => $value) {
-				if(in_array($key, $fields)) {
+				if (in_array($key, $fields)) {
 					$object[$key] = $value;
 				}
 			}
@@ -1488,11 +1488,11 @@ class Thirdparties extends DolibarrApi
 			// We found an existing SocieteAccount entity, we are replacing it
 		} else {
 			if (isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 				$result = $db->query($sql);
 
 				if ($result->num_rows !== 0) {
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key.");
 				}
 			}
 
@@ -1676,9 +1676,9 @@ class Thirdparties extends DolibarrApi
         // phpcs:enable
 		$object = parent::_cleanObjectDatas($object);
 
-		unset($object->nom);	// ->name already defined and nom deprecated
-		unset($object->name_bis);	// ->name_alias already defined
-		unset($object->note);	// ->note_private and note_public already defined
+		unset($object->nom); // ->name already defined and nom deprecated
+		unset($object->name_bis); // ->name_alias already defined
+		unset($object->note); // ->note_private and note_public already defined
 		unset($object->departement);
 		unset($object->departement_code);
 		unset($object->pays);
@@ -1694,7 +1694,7 @@ class Thirdparties extends DolibarrApi
 		unset($object->lines);
 		unset($object->thirdparty);
 
-		unset($object->fk_delivery_address);	// deprecated feature
+		unset($object->fk_delivery_address); // deprecated feature
 
 		return $object;
 	}
@@ -1742,20 +1742,20 @@ class Thirdparties extends DolibarrApi
     private function _fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
     {
         global $conf;
-        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+        if (!DolibarrApiAccess::$user->rights->societe->lire) {
             throw new RestException(401);
         }
 
         $result = $this->company->fetch($rowid, $ref, $ref_ext, $ref_int, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Thirdparty not found');
         }
 
-        if( ! DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
+        if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+        if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
             $filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
             $filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
         } else {
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 78eda38ea51..1ccb1631a31 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -163,7 +163,7 @@ dol_fiche_head($head, 'stripeaccount', '', -1);
 
 $stripearrayofwebhookevents = array('payout.created', 'payout.paid', 'charge.pending', 'charge.refunded', 'charge.succeeded', 'charge.failed', 'payment_intent.succeeded', 'payment_intent.payment_failed', 'payment_method.attached', 'payment_method.updated', 'payment_method.card_automatically_updated', 'payment_method.detached', 'source.chargeable', 'customer.deleted');
 
-print $langs->trans("StripeDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("StripeDesc")."</span><br>\n";
 
 print '<br>';
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index adb39743af7..584fcd0f4a5 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1244,11 +1244,11 @@ if ($action == 'create')
 	}
 
 	// Other attributes
-	$parameters = array('colspan' => ' colspan="3"');
+	$parameters = array('colspan' => ' colspan="3"', 'cols' => 3);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (empty($reshook)) {
-		print $object->showOptionals($extrafields, 'edit');
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index c87bb46adf3..6c4bea3ba8b 100644
--- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -53,7 +53,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
     		echo price($objectlink->total_ht);
     	} ?></td>
     	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-    	<td class="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+    	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
     </tr>
     <?php
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 32febd2a6fb..e076d6eb58a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -293,7 +293,7 @@ hr { border: 0; border-top: 1px solid #ccc; }
 	margin-top: 0;
 	margin-left: 5px;
 	margin-right: 5px;
-    	font-family: <?php print $fontlist ?>;
+	font-family: <?php print $fontlist ?>;
 	display: inline-block;
 	padding: 4px 14px;
 	text-align: center;
@@ -529,7 +529,9 @@ body[class*="colorblind-"] .text-success{
 
 .fa-toggle-on, .fa-toggle-off { font-size: 2em; }
 .websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off,
-.asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off { font-size: 1.5em; vertical-align: text-bottom; }
+.asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off { 
+	font-size: 1.5em; vertical-align: text-bottom; 
+}
 
 /* Themes for badges */
 <?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
@@ -809,7 +811,7 @@ table[summary="list_of_modules"] .fa-cog {
 
 .img-skinthumb {
 	width: 160px;
-	height: 120px;
+	height: 100px;
 }
 
 
@@ -1263,7 +1265,6 @@ div.fiche>table:first-child {
 	margin-bottom: 15px !important;
 }
 div.fichecenter {
-	/* margin-top: 10px; */
 	width: 100%;
 	clear: both;	/* This is to have div fichecenter that are true rectangles */
 }
@@ -1630,18 +1631,6 @@ li.tmenusel::after, li.tmenu:hover::after{
 	border-width: 0px 6px 5px 6px;
 	border-color:  transparent transparent #ffffff transparent;
 }
-/*
-// Add a bottom arrow
-li.tmenusel::before, li.tmenu:hover::before{
-	content: "";
-	position:absolute;
-	top:0px;
-	left:0;
-	width: 100%;
-	height: 2px;
-	background: #fff;
-}*/
-
 
 .tmenuend .tmenuleft { width: 0px; }
 .tmenuend { display: none; }
@@ -2120,9 +2109,9 @@ img.login, img.printer, img.entity {
     background-size: contain;
 }
 img.userphoto {			/* size for user photo in lists */
-	border-radius: 0.725em;
-	width: 1.45em;
-    height: 1.45em;
+	border-radius: 0.72em;
+	width: 1.4em;
+    height: 1.4em;
     background-size: contain;
     vertical-align: middle;
 }
@@ -2431,6 +2420,11 @@ div.popuptab {
 	padding-left: 5px;
 	padding-right: 5px;
 }
+
+/* ============================================================================== */
+/* Buttons for actions                                                            */
+/* ============================================================================== */
+
 div.tabsAction {
     margin: 20px 0em 30px 0em;
     padding: 0em 0em;
@@ -3113,7 +3107,9 @@ tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_tit
     border-bottom: unset;
 }
 
-
+div.liste_titre {
+	padding-left: 3px;
+}
 tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div
 {
     font-family: <?php print $fontlist ?>;
@@ -3246,7 +3242,6 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
     min-height: 40px;
     padding-right: 0px;
     padding-left: 0px;
-    /*padding-bottom: 25px;*/
     padding-bottom: 10px;
 }
 .ficheaddleft div.boxstats, .ficheaddright div.boxstats {
@@ -3380,9 +3375,6 @@ span.dashboardlineok {
 }
 span.dashboardlineko {
 	color: #FFF;
-	/*color: #8c4446 ! important;
-	padding-left: 1px;*/
-
 	font-size: 80%;
 }
 .dashboardlinelatecoin {
@@ -4493,7 +4485,6 @@ td.gminorheading {
 .ecmfiletree {
 	width: 99%;
 	height: 99%;
-	/* background: #FFF; */
 	padding-left: 2px;
 	font-weight: normal;
 }
@@ -5962,6 +5953,11 @@ div.tabsElem a.tab {
 	.text-plus-circle {
 	   display: none;
 	}
+
+	table.table-fiche-title .col-title div.titre{
+		line-height: unset;
+	}
+
 }
 
 <?php
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ed1ca8a9279..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='0.86em';
-    $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/style.css.php b/htdocs/theme/md/style.css.php
index e6faa703e2d..b4c8ab558eb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -44,7 +44,6 @@ define('ISLOADEDBYSTEELSHEET', '1');
 require __DIR__.'/theme_vars.inc.php';
 if (defined('THEME_ONLY_CONSTANT')) return;
 
-
 session_cache_limiter('public');
 
 
@@ -112,7 +111,7 @@ 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 = '14';
+	$conf->global->THEME_ELDY_FONT_SIZE1 = $fontsize;
 	$conf->global->THEME_ELDY_FONT_SIZE2 = '11';
 }
 
@@ -238,7 +237,7 @@ body {
 	background: rgb(<?php print $colorbackbody; ?>);
 <?php } ?>
 	color: rgb(<?php echo $colortext; ?>);
-	font-size: <?php print $fontsize ?>px;
+	font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?>;
 	line-height: 1.3;
 	font-family: <?php print $fontlist ?>;
     margin-top: 0;
@@ -300,7 +299,6 @@ select#date_startday, select#date_startmonth, select#date_endday, select#date_en
 	margin-right: 4px;
 }
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
-    font-size: <?php print $fontsize ?>px;
 	font-family: <?php print $fontlist ?>;
     border: none;
     border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px rgba(0,0,0,.2);
@@ -422,7 +420,7 @@ a.buttonticket {
 	padding-right: 5px;
 }
 
-/* Used for timesheets */
+/* Used by timesheets */
 span.timesheetalreadyrecorded input {
     border: none;
     border-bottom: solid 1px rgba(0,0,0,0.1);
@@ -434,9 +432,6 @@ td.onholidaymorning, td.onholidayafternoon {
 td.onholidayallday {
 	background-color: #f4eede;
 }
-td.actionbuttons a {
-    padding-left: 6px;
-}
 td.leftborder, td.hide0 {
 	border-left: 1px solid #ccc;
 }
@@ -447,6 +442,9 @@ td.rightborder {
 	border-right: 1px solid #ccc;
 }
 
+td.actionbuttons a {
+    padding-left: 6px;
+}
 select.flat, form.flat select {
 	font-weight: normal;
 	font-size: unset;
@@ -467,8 +465,9 @@ select.flat, form.flat select {
 .opacitytransp {
 	opacity: 0;
 }
-select:invalid { color: gray; }
-
+select:invalid {
+	color: gray;
+}
 input:disabled, textarea:disabled, select[disabled='disabled']
 {
 	background:#eee;
@@ -514,13 +513,13 @@ div#moretabsList, div#moretabsListaction {
 hr { border: 0; border-top: 1px solid #ccc; }
 
 .button, .buttonDelete, input[name="sbmtConnexion"] {
-    font-family: <?php print $fontlist ?>;
 	border-color: #c5c5c5;
 	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
 	display: inline-block;
 	padding: 4px 14px;
 	margin-bottom: 0;
 	margin-top: 0;
+    font-family: <?php print $fontlist ?>;
 	text-align: center;
 	cursor: pointer;
 	color: #333333 !important;
@@ -567,6 +566,9 @@ hr { border: 0; border-top: 1px solid #ccc; }
     border: unset;
     background: unset;
 }
+.button_search:hover, .button_removefilter:hover {
+    cursor: pointer;
+}
 form {
     padding:0px;
     margin:0px;
@@ -621,6 +623,19 @@ th .button {
 textarea.centpercent {
 	width: 96%;
 }
+.small, small {
+    font-size: 85%;
+}
+
+.h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small {
+    font-size: 65%;
+}
+.h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, .h4 .small, .h4 small, .h5 .small, .h5 small, .h6 .small, .h6 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small, h4 .small, h4 small, h5 .small, h5 small, h6 .small, h6 small {
+    font-weight: 400;
+    line-height: 1;
+    color: #777;
+}
+
 .center {
     text-align: center;
     margin: 0px auto;
@@ -634,6 +649,12 @@ textarea.centpercent {
 .justify {
 	text-align: justify;
 }
+.pull-left {
+    float: left!important;
+}
+.pull-right {
+    float: right!important;
+}
 .nowrap {
 	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
@@ -722,15 +743,18 @@ body[class*="colorblind-"] .text-success{
     color : <?php print $textDanger; ?>
 }
 
-.editfielda span.fa-pencil-alt {
+.editfielda span.fa-pencil-alt, .editfielda span.fa-trash {
     color: #ccc !important;
 }
-.editfielda span.fa-pencil-alt:hover {
+.editfielda span.fa-pencil-alt:hover, .editfielda span.fa-trash:hover {
     color: rgb(<?php echo $colortexttitle; ?>) !important;
 }
 
 .fa-toggle-on, .fa-toggle-off { font-size: 2em; }
-.websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off { font-size: 1.5em; vertical-align: text-bottom; }
+.websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off,
+.asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off {
+	font-size: 1.5em; vertical-align: text-bottom;
+}
 
 
 /* Themes for badges */
@@ -768,6 +792,14 @@ div.divsearchfield {
     padding-bottom: 5px;
     opacity: 0.6;
 }
+<?php
+// Add a nowrap on smartphone, so long list of field used for filter are overflowed with clip
+if ($conf->browser->layout == 'phone') {
+	?>
+.divsearchfieldfilter {
+   	white-space: nowrap;
+}
+<?php } ?>
 div.confirmmessage {
 	padding-top: 6px;
 }
@@ -804,13 +836,13 @@ select.flat.selectlimit {
 	margin-right: 10px !important;
 }
 .marginleftonly {
-	margin-left: 10px !important;
+	margin-<?php echo $left; ?>: 10px !important;
 }
 .marginleftonlyshort {
-	margin-left: 4px !important;
+	margin-<?php echo $left; ?>: 4px !important;
 }
 .nomarginleft {
-	margin-left: 0px !important;
+	margin-<?php echo $left; ?>: 0px !important;
 }
 .margintoponly {
 	margin-top: 10px !important;
@@ -871,6 +903,20 @@ select.flat.selectlimit {
     max-width: 0;
     overflow: auto;
 }
+.divintdwithtwolinesmax {
+    width: 75px;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+}
+.twolinesmax {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+}
+
 .tablelistofcalendars {
 	margin-top: 25px !important;
 }
@@ -914,6 +960,10 @@ select.flat.selectlimit {
 	color: #505;
 }
 
+.fa-15 {
+	font-size: 1.5em;
+}
+
 /* DOL_XXX for future usage (when left menu has been removed). If we do not use datatable */
 /*.table-responsive {
     width: calc(100% - 330px);
@@ -922,6 +972,9 @@ select.flat.selectlimit {
     -ms-overflow-style: -ms-autohiding-scrollbar;
 }*/
 /* Style used for most tables */
+div.fiche>div.tabBar>form>div.div-table-responsive {
+    min-height: 392px;
+}
 .div-table-responsive, .div-table-responsive-no-min {
     overflow-x: auto;
     min-height: 0.01%;
@@ -938,7 +991,7 @@ div.fiche>form>div.div-table-responsive {
 }
 
 .flexcontainer {
-    <?php if (in_array($conf->browser->browsername, array('chrome', 'firefox'))) echo 'display: inline-flex;' ?>
+    <?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) echo 'display: inline-flex;' ?>
     flex-flow: row wrap;
     justify-content: flex-start;
 }
@@ -968,6 +1021,15 @@ table[summary="list_of_modules"] .fa-cog {
     font-size: 1.5em;
 }
 
+.linkedcol-element {
+	min-width: 100px;
+}
+
+.img-skinthumb {
+	width: 160px;
+	height: 100px;
+}
+
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
@@ -1023,6 +1085,16 @@ table[summary="list_of_modules"] .fa-cog {
 .titlefield       { /* width: 25%; */ width: 250px; }
 .titlefieldmiddle { width: 50%; }
 .imgmaxwidth180 { max-width: 180px; }
+.imgmaxheight50 { max-height: 50px; }
+
+.width20p { width:20%; }
+.width25p { width:25%; }
+.width40p { width:40%; }
+.width50p { width:50%; }
+.width60p { width:60%; }
+.width75p { width:75%; }
+.width80p { width:80%; }
+.width100p { width:100%; }
 
 
 /* Force values for small screen 1400 */
@@ -1038,6 +1110,11 @@ table[summary="list_of_modules"] .fa-cog {
     .minwidth300imp { min-width: 300px !important; }
     .minwidth400imp { min-width: 300px !important; }
     .minwidth500imp { min-width: 300px !important; }
+
+
+    .linkedcol-element {
+		min-width: unset;
+	}
 }
 
 /* Force values for small screen 1000 */
@@ -1058,10 +1135,10 @@ table[summary="list_of_modules"] .fa-cog {
 @media only screen and (max-width: 767px)
 {
 	body {
-		font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?>;
+		font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?>;
 	}
 	div.refidno {
-		font-size: <?php print is_numeric($fontsize) ? ($fontsize + 3).'px' : $fontsize; ?> !important;
+		font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?> !important;
 	}
 }
 
@@ -1069,10 +1146,10 @@ table[summary="list_of_modules"] .fa-cog {
 @media only screen and (max-width: 570px)
 {
 	body {
-		font-size: <?php print $fontsize + 3; ?>px;
+		font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?>;
 	}
 	div.refidno {
-		font-size: <?php print $fontsize + 3; ?>px !important;
+		font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?> !important;
 	}
 
 	.login_vertical_align {
@@ -1090,7 +1167,7 @@ table[summary="list_of_modules"] .fa-cog {
 	div.fiche {
 		    margin-top: <?php print ($dol_hide_topmenu ? '12' : '6'); ?>px !important;
 	}
-    .border tbody tr, .border tbody tr td, div.tabBar table.border tr {
+    .border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
     	height: 40px !important;
     }
 
@@ -1103,6 +1180,9 @@ table[summary="list_of_modules"] .fa-cog {
 		padding-bottom: 5px;
 	}
 
+	.login_table .tdinputlogin {
+		min-width: unset !important;
+	}
 	input, input[type=text], input[type=password], select, textarea     {
 		min-width: 20px;
     	min-height: 1.4em;
@@ -1110,6 +1190,7 @@ table[summary="list_of_modules"] .fa-cog {
      }
 
     .hideonsmartphone { display: none; }
+    .hideonsmartphoneimp { display: none !important; }
     .noenlargeonsmartphone { width : 50px !important; display: inline !important; }
     .maxwidthonsmartphone, #search_newcompany.ui-autocomplete-input { max-width: 100px; }
     .maxwidth50onsmartphone { max-width: 40px; }
@@ -1143,7 +1224,7 @@ table[summary="list_of_modules"] .fa-cog {
 	}
 
 	div.divphotoref {
-		padding-right: 5px;
+		padding-<?php echo $right; ?>: 5px;
 	    padding-bottom: 5px;
 	}
     img.photoref, div.photoref {
@@ -1401,6 +1482,9 @@ div.fiche {
 body.onlinepaymentbody div.fiche {	/* For online payment page */
 	margin: 20px !important;
 }
+div.fiche>table:first-child {
+	margin-bottom: 15px !important;
+}
 div.fichecenter {
 	width: 100%;
 	clear: both;	/* This is to have div fichecenter that are true rectangles */
@@ -1487,17 +1571,13 @@ div.secondcolumn div.box {
 }
 
 /* For table into table into card */
-div.fichehalfright tr.liste_titre:first-child td table.nobordernopadding td, div.nopadding {
+div.fichehalfright tr.liste_titre:first-child td table.nobordernopadding td {
     padding: 0 0 0 0;
 }
 div.nopadding {
 	padding: 0 !important;
 }
 
-table.noborder tr.liste_titre td {
-	padding: 3px !important;
-}
-
 .containercenter {
 	display : table;
 	margin : 0px auto;
@@ -1566,7 +1646,7 @@ div.heightref {
 	min-height: 80px;
 }
 div.divphotoref {
-	padding-right: 20px;
+	padding-<?php echo $right; ?>: 20px;
 }
 div.paginationref {
 	padding-bottom: 10px;
@@ -1617,7 +1697,7 @@ img.photorefnoborder {
 .underrefbanner {
 }
 .underbanner {
-	border-bottom: <?php echo $borderwidth; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
+	border-bottom: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
 }
 
 .trextrafieldseparator td {
@@ -1913,9 +1993,7 @@ div.mainmenu.website {
 		'don'=>'accountancy', 'tax'=>'accountancy', 'banque'=>'accountancy', 'facture'=>'accountancy', 'compta'=>'accountancy', 'accounting'=>'accountancy', 'adherent'=>'members', 'import'=>'tools', 'export'=>'tools', 'mailing'=>'tools',
 		'contrat'=>'commercial', 'ficheinter'=>'commercial', 'ticket'=>'ticket', 'deplacement'=>'commercial',
 		'fournisseur'=>'companies',
-		'barcode'=>'',
-		'fckeditor'=>'',
-		'categorie'=>'',
+		'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
 	);
 	$mainmenuused = 'home';
 	foreach ($conf->modules as $val)
@@ -2498,6 +2576,7 @@ div.tabBar.tabBarNoTop {
 }
 */
 
+/* tabBar used for creation/update/send forms */
 div.tabBarWithBottom {
 	padding-bottom: 18px;
 	border-bottom: 1px solid #aaa;
@@ -2508,6 +2587,10 @@ div.tabBar table.tableforservicepart2:last-child {
 .tableforservicepart1 .tdhrthin {
 	height: unset;
 }
+/* Payment Screen : Pointer cursor in the autofill image */
+.AutoFillAmount {
+	cursor:pointer;
+}
 
 /* ============================================================================== */
 /* Buttons for actions                                                            */
@@ -2671,6 +2754,10 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 	margin: 0px 0px 0px 0px;
 }
 
+table.tableforemailform tr td {
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
 
 table.border, table.bordernooddeven, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border {
 	border: 1px solid #f4f4f4;
@@ -2681,7 +2768,7 @@ table.borderplus {
 	border: 1px solid #BBB;
 }
 
-.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
+.border tbody tr, .bordernooddeven tbody tr, .border tbody tr td, .bordernooddeven tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
 	height: 26px;
 }
 tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
@@ -2738,7 +2825,7 @@ div.colorback
     border-left: 1px solid #ccc;
 }
 table.liste, table.noborder, table.formdoc, div.noborder {
-	width: calc(100% - 1px);	/* -1 to fix a bug. Without, a scroll appears dur to overflow-x: auto; of div-tableèresponsive
+	width: calc(100% - 1px);	/* -1 to fix a bug. Without, a scroll appears due to overflow-x: auto; of div-table-responsive */
 
 	border-collapse: separate !important;
 	border-spacing: 0px;
@@ -3020,6 +3107,9 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
 
 /* Set the color for hover lines */
 
+.tmenucompanylogo.nohover, .tmenucompanylogo.nohover:hover {
+	opacity: unset !important;
+}
 .nohoverborder:hover {
 	border: unset;
 	box-shadow: unset;
@@ -3039,7 +3129,16 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
 }
 <?php } ?>
 
-.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover
+.nohover:hover {
+	background: unset;
+}
+.nohoverborder:hover {
+	border: unset;
+	box-shadow: unset;
+	-webkit-box-shadow: unset;
+}
+
+.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover, .tagtr.oddeven
 {
 	font-family: <?php print $fontlist ?>;
 	border: 0px;
@@ -3051,10 +3150,10 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 #GanttChartDIV {
-	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
+	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?>;
 }
 
-.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover {
+.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: #202020;
@@ -3071,7 +3170,7 @@ td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.imp
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklineimpair1)); ?> !important;
 }
-td.evenodd, tr.nohoverpair td {
+td.evenodd, tr.nohoverpair td, #trlinefordates td {
 	background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 	background: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?> !important;
 }
@@ -3376,9 +3475,9 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
 }
 span.boxstatstext {
+    /* opacity: 0.7; */		/* a bug if browser make z-index infintie when opacity is set so we disable it */
     line-height: 18px;
     color: #000;
-    /* opacity: 0.7; */		/* a bug if browser make z-index infintie when opacity is set so we disable it */
 }
 .boxstatsindicator.thumbstat150 {	/* If we remove this, box position is ko on ipad */
 	display: inline-flex;
@@ -3487,7 +3586,10 @@ img.boxhandle, img.boxclose {
     vertical-align: middle;
 }
 
-
+.modulebuilderbox {
+	border: 1px solid #888;
+	padding: 16px;
+}
 
 
 
@@ -3655,6 +3757,9 @@ div.titre, .secondary {
 	color: rgb(<?php print $colortexttitlenotab; ?>);
 }
 
+table.centpercent.notopnoleftnoright.table-fiche-title {
+	margin-bottom: 10px !important;
+}
 table.table-fiche-title .col-title div.titre{
 	line-height: 40px;
 }
@@ -3731,6 +3836,19 @@ div#card-errors {
     font-size: <?php print $fontsize; ?>px !important;
 }
 
+
+/* ============================================================================== */
+/* For content of image preview                                                   */
+/* ============================================================================== */
+
+/*
+.ui-dialog-content.ui-widget-content > object {
+     max-height: none;
+     width: auto; margin-left: auto; margin-right: auto; display: block;
+}
+*/
+
+
 /* ============================================================================== */
 /* Formulaire confirmation (When HTML is used)                                    */
 /* ============================================================================== */
@@ -3927,6 +4045,9 @@ tr.visible {
 	display: inline-block;
     padding: 4px 0 4px 0;
 }
+.websitebar .buttonDelete, .websitebar .button {
+	text-shadow: none;
+}
 .websitebar .button, .websitebar .buttonDelete
 {
 	padding: 2px 4px 2px 4px !important;
@@ -3946,17 +4067,21 @@ tr.visible {
 	float: right;
 }
 .websiteselection, .websitetools {
-	margin-top: 3px;
+	/* margin-top: 3px;
 	padding-top: 3px;
-	padding-bottom: 3px;
+	padding-bottom: 3px; */
 }
 .websiteinputurl {
     display: inline-block;
     vertical-align: top;
+    line-height: 28px;
 }
 .websiteiframenoborder {
 	border: 0px;
 }
+span.websitebuttonsitepreview, a.websitebuttonsitepreview {
+	vertical-align: middle;
+}
 span.websitebuttonsitepreview img, a.websitebuttonsitepreview img {
 	width: 26px;
 	display: inline-block;
@@ -3972,6 +4097,14 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
     float: right;
     padding-top: 8px;
 }
+.websiteselectionsection {
+	border-left: 1px solid #bbb;
+	border-right: 1px solid #bbb;
+	margin-left: 0px;
+	padding-left: 8px;
+	margin-right: 5px;
+}
+
 
 /* ============================================================================== */
 /*  Module agenda                                                                 */
@@ -4016,6 +4149,8 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
 .cal_event_busy      { }
 .cal_peruserviewname { max-width: 140px; height: 22px; }
 
+.calendarviewcontainertr { height: 100px; }
+
 .topmenuimage {
 	background-size: 24px auto;
 }
@@ -4250,7 +4385,6 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 }
 .ui-widget {
     font-family:<?php echo $fontlist; ?>;
-    font-size:<?php echo $fontsize; ?>px;
 }
 .ui-button { margin-left: -2px; <?php print (preg_match('/chrome/', $conf->browser->name) ? 'padding-top: 1px;' : ''); ?> }
 .ui-button-icon-only .ui-button-text { height: 8px; }
@@ -4266,6 +4400,10 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 /*  CKEditor                                                                      */
 /* ============================================================================== */
 
+body.cke_show_borders {
+    margin: 5px !important;
+}
+
 .cke_dialog {
     border: 1px #bbb solid ! important;
 }
@@ -4375,6 +4513,65 @@ pre#editfilecontentaceeditorid {
 }
 
 
+/* ============================================================================== */
+/*  Comments                                                                   	  */
+/* ============================================================================== */
+
+#comment div {
+	box-sizing:border-box;
+}
+#comment .comment {
+    border-radius:7px;
+    margin-bottom:10px;
+    overflow:hidden;
+}
+#comment .comment-table {
+    display:table;
+    height:100%;
+}
+#comment .comment-cell {
+    display:table-cell;
+}
+#comment .comment-info {
+    font-size:0.8em;
+    border-right:1px solid #dedede;
+    margin-right:10px;
+    width:160px;
+    text-align:center;
+    background:rgba(255,255,255,0.5);
+    vertical-align:middle;
+    padding:10px 2px;
+}
+#comment .comment-info a {
+    color:inherit;
+}
+#comment .comment-right {
+    vertical-align:top;
+}
+#comment .comment-description {
+    padding:10px;
+    vertical-align:top;
+}
+#comment .comment-delete {
+    width: 100px;
+    text-align:center;
+    vertical-align:middle;
+}
+#comment .comment-delete:hover {
+    background:rgba(250,20,20,0.8);
+}
+#comment .comment-edit {
+    width: 100px;
+    text-align:center;
+    vertical-align:middle;
+}
+#comment .comment-edit:hover {
+    background:rgba(0,184,148,0.8);
+}
+#comment textarea {
+    width: 100%;
+}
+
 
 /* ============================================================================== */
 /*  JSGantt                                                                       */
@@ -4469,10 +4666,6 @@ ul.filedirelem li {
     border: solid 1px #f4f4f4;
 }
 
-.ui-layout-north {
-
-}
-
 ul.ecmjqft {
 	line-height: 16px;
 	padding: 0px;
@@ -4542,6 +4735,7 @@ div#ecm-layout-center {
 	max-width: 1024px;
 	padding-left: 10px !important;
 	padding-right: 10px !important;
+	word-wrap: break-word;
 }
 .jnotify-container .jnotify-notification .jnotify-message {
 	font-weight: normal;
@@ -4579,7 +4773,7 @@ div.dolEventError h1, div.dolEventError h2 {
 /*  Maps                                                                          */
 /* ============================================================================== */
 
-.divmap, #google-visualization-geomap-embed-0, #google-visualization-geomap-embed-1, google-visualization-geomap-embed-2 {
+.divmap, #google-visualization-geomap-embed-0, #google-visualization-geomap-embed-1, #google-visualization-geomap-embed-2 {
 }
 
 
@@ -5019,7 +5213,7 @@ dl.dropdown {
 }
 .dropdown ul {
     margin: -1px 0 0 0;
-    text-align: left;
+    text-align: <?php echo $left; ?>;
 }
 .dropdown dd {
     position:relative;
@@ -5041,7 +5235,7 @@ dl.dropdown {
     background-color: #FFF;
     box-shadow: 1px 1px 10px #aaa;
     display:none;
-    right:0px;						/* pop is align on right */
+    <?php echo $right; ?>:0px;						/* pop is align on right */
     padding: 0 0 0 0;
     position:absolute;
     top:2px;
@@ -5053,13 +5247,14 @@ dl.dropdown {
 	white-space: nowrap;
 	font-weight: normal;
 	padding: 7px 8px 7px 8px;
+	/* color: rgb(<?php print $colortext; ?>); */
 	color: #000;
 }
 .dropdown dd ul li:hover {
 	background: #eee;
 }
 .dropdown dd ul li input[type="checkbox"] {
-    margin-right: 3px;
+    margin-<?php echo $right; ?>: 3px;
 }
 .dropdown dd ul li a, .dropdown dd ul li span {
     padding: 3px;
@@ -5113,7 +5308,7 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
 	min-width: .4em;
 	padding-left: 6px;
 	padding-right: 6px;
-	font-size: <?php print $fontsize ?>px;
+	font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?>;
 	/* white-space: normal; */		/* Warning, enable this break the truncate feature */
 }
 .ui-btn-icon-right .ui-btn-inner {
@@ -5833,7 +6028,7 @@ border-top-right-radius: 6px;
     }
 
 	.titlefield {
-		width: auto !important;		/* We want to ignor the 30%, try to use more if you can */
+		width: auto !important;		/* We want to ignore the 30%, try to use more if you can */
 	}
 	.tableforfield>tr>td:first-child, .tableforfield>tbody>tr>td:first-child, div.tableforfield div.tagtr>div.tagtd:first-of-type {
 	    /* max-width: 100px; */			/* but no more than 100px */
@@ -5841,6 +6036,10 @@ border-top-right-radius: 6px;
 	.tableforfield>tr>td:nth-child(2), .tableforfield>tbody>tr>td:nth-child(2), div.tableforfield div.tagtr>div.tagtd:nth-child(2) {
 	    word-break: break-word;
 	}
+
+	table.table-fiche-title .col-title div.titre{
+		line-height: unset;
+	}
 }
 
 
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 6bf6ae20138..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';
-$fontsize='14';
-$fontsizesmaller='11';
+$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';
 
 // 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/agenda.php b/htdocs/ticket/agenda.php
index 49b901c6d12..c5ffc4b0ab8 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -42,8 +42,8 @@ $action   = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder");
-$page = GETPOST("page");
+$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";
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 9692e074397..00771f4fdba 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -95,7 +95,7 @@ if ($id || $track_id || $ref) {
 $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 $result = restrictedArea($user, 'ticket', $object->id);
 
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index da7bf1aaadc..fd432fa6dde 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -42,8 +42,8 @@ $action   = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "alpha");
-$sortorder = GETPOST("sortorder");
-$page = GETPOST("page");
+$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";
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index 538519bbf2e..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,9 +61,9 @@ 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 href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
+    			<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/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index a7d98ca0b2d..1fa9e971306 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -71,7 +71,7 @@ class Users extends DolibarrApi
 
 	    $obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->user->user->lire) {
+		if (!DolibarrApiAccess::$user->rights->user->user->lire) {
 	        throw new RestException(401, "You are not allowed to read list of users");
 	    }
 
@@ -79,29 +79,29 @@ class Users extends DolibarrApi
 	    //$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $societe;
 
 	    $sql = "SELECT t.rowid";
-	    $sql.= " FROM ".MAIN_DB_PREFIX."user as t";
-	    $sql.= ' WHERE t.entity IN ('.getEntity('user').')';
-	    if ($user_ids) $sql.=" AND t.rowid IN (".$user_ids.")";
+	    $sql .= " FROM ".MAIN_DB_PREFIX."user as t";
+	    $sql .= ' WHERE t.entity IN ('.getEntity('user').')';
+	    if ($user_ids) $sql .= " AND t.rowid IN (".$user_ids.")";
 	    // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-	    $sql.= $db->order($sortfield, $sortorder);
-	    if ($limit)	{
+	    $sql .= $db->order($sortfield, $sortorder);
+	    if ($limit) {
 	        if ($page < 0)
 	        {
 	            $page = 0;
 	        }
 	        $offset = $limit * $page;
 
-	        $sql.= $db->plimit($limit + 1, $offset);
+	        $sql .= $db->plimit($limit + 1, $offset);
 	    }
 
 	    $result = $db->query($sql);
@@ -115,7 +115,7 @@ class Users extends DolibarrApi
 	        {
 	            $obj = $db->fetch_object($result);
 	            $user_static = new User($db);
-	            if($user_static->fetch($obj->rowid)) {
+	            if ($user_static->fetch($obj->rowid)) {
 	                $obj_ret[] = $this->_cleanObjectDatas($user_static);
 	            }
 	            $i++;
@@ -124,7 +124,7 @@ class Users extends DolibarrApi
 	    else {
 	        throw new RestException(503, 'Error when retrieve User list : '.$db->lasterror());
 	    }
-	    if( ! count($obj_ret)) {
+	    if (!count($obj_ret)) {
 	        throw new RestException(404, 'No User found');
 	    }
 	    return $obj_ret;
@@ -154,7 +154,7 @@ class Users extends DolibarrApi
 
 		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->_cleanObjectDatas($this->useraccount);
@@ -181,7 +181,7 @@ class Users extends DolibarrApi
         }
 
         if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user')) {
-            throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
         $usergroup = new UserGroup($this->db);
@@ -190,10 +190,9 @@ class Users extends DolibarrApi
             throw new RestException(404, 'User group not found');
         }
 
-        $this->useraccount = $this->_cleanObjectDatas($this->useraccount);
         $this->useraccount->user_group_list = $this->_cleanUserGroupListDatas($userGroupList);
 
-        return $this->useraccount;
+        return $this->_cleanObjectDatas($this->useraccount);
     }
 
 	/**
@@ -251,7 +250,7 @@ class Users extends DolibarrApi
 
 		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		foreach ($request_data as $field => $value)
@@ -296,13 +295,13 @@ class Users extends DolibarrApi
 	{
 		$obj_ret = array();
 
-		if (! DolibarrApiAccess::$user->rights->user->user->lire) {
+		if (!DolibarrApiAccess::$user->rights->user->user->lire) {
 			throw new RestException(401);
 		}
 
 		$user = new User($this->db);
 		$result = $user->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'user not found');
 		}
 
@@ -342,12 +341,12 @@ class Users extends DolibarrApi
 
 		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && ! empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity))
+		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity))
 		{
-			$entity = (! empty($entity) ? $entity : $conf->entity);
+			$entity = (!empty($entity) ? $entity : $conf->entity);
 		}
 		else
 		{
@@ -357,7 +356,7 @@ class Users extends DolibarrApi
 		}
 
 		$result = $this->useraccount->SetInGroup($group, $entity);
-		if (! ($result > 0))
+		if (!($result > 0))
 		{
 			throw new RestException(500, $this->useraccount->error);
 		}
@@ -384,7 +383,7 @@ class Users extends DolibarrApi
 
 		if (!DolibarrApi::_checkAccessToResource('user', $this->useraccount->id, 'user'))
 		{
-			throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         $this->useraccount->oldcopy = clone $this->useraccount;
 		return $this->useraccount->delete(DolibarrApiAccess::$user);
@@ -436,10 +435,10 @@ class Users extends DolibarrApi
 	    unset($object->openid);
 
 
-	    $canreadsalary = ((! empty($conf->salaries->enabled) && ! empty(DolibarrApiAccess::$user->rights->salaries->read))
-	    	|| (! empty($conf->hrm->enabled) && ! empty(DolibarrApiAccess::$user->rights->hrm->employee->read)));
+	    $canreadsalary = ((!empty($conf->salaries->enabled) && !empty(DolibarrApiAccess::$user->rights->salaries->read))
+	    	|| (!empty($conf->hrm->enabled) && !empty(DolibarrApiAccess::$user->rights->hrm->employee->read)));
 
-		if (! $canreadsalary)
+		if (!$canreadsalary)
 		{
 			unset($object->salary);
 			unset($object->salaryextra);
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 63b31328716..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)) {
@@ -115,18 +115,17 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $langs->trans("ThirdParty").' - '.$langs->trans("Files"), $help_url);
+llxHeader('', $langs->trans("UserCard").' - '.$langs->trans("Files"));
 
 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');
 
@@ -141,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'];
 	}
 
 
@@ -169,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/user/group/card.php b/htdocs/user/group/card.php
index 54a1b7dce88..ff0c74dad69 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -304,7 +304,7 @@ if ($action == 'create')
     print "</td></tr>\n";
 
 	// Other attributes
-    $parameters = array('object' => $object, 'colspan' => ' colspan="2"');
+    $parameters = array('object' => $object);
     $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
     print $hookmanager->resPrint;
     if (empty($reshook))
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 16aa16765a9..39dc2e61f9f 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -71,24 +71,19 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
-	if ($action == 'addrights' && $caneditperms)
-	{
+if (empty($reshook)) {
+	if ($action == 'addrights' && $caneditperms) {
 		$editgroup = new Usergroup($db);
 		$result = $editgroup->fetch($id);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$editgroup->addrights($rights, $module, '', $entity);
 		}
 	}
 
-	if ($action == 'delrights' && $caneditperms)
-	{
+	if ($action == 'delrights' && $caneditperms) {
 		$editgroup = new Usergroup($db);
 		$result = $editgroup->fetch($id);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$editgroup->delrights($rights, $module, '', $entity);
 		}
 	}
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');
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index d35ca0130cb..dff0dd70175 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -825,14 +825,26 @@ if ($action == 'addcontainer')
 
 	if (!$error)
 	{
-		$res = $objectpage->create($user);
-		if ($res <= 0)
-		{
+		$pageid = $objectpage->create($user);
+		if ($pageid <= 0) {
 			$error++;
 			setEventMessages($objectpage->error, $objectpage->errors, 'errors');
 			$action = 'createcontainer';
 		}
+		else {
+			// If there is no home page yet, this new page will be set as the home page
+			if (empty($object->fk_default_home)) {
+				$object->fk_default_home = $pageid;
+				$res = $object->update($user);
+				if ($res <= 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
 	}
+
 	if (!$error)
 	{
 		if (!empty($objectpage->content))
@@ -1398,7 +1410,7 @@ if ($action == 'updatemeta')
 		$objectpage->keywords = GETPOST('WEBSITE_KEYWORDS', 'alpha');
 		$objectpage->lang = GETPOST('WEBSITE_LANG', 'aZ09');
 		$objectpage->htmlheader = trim(GETPOST('htmlheader', 'none'));
-		$objectpage->fk_page = GETPOST('pageidfortranslation', 'int');
+		$objectpage->fk_page = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
 
 		$newdatecreation = dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
 		if ($newdatecreation) $objectpage->date_creation = $newdatecreation;
@@ -2891,7 +2903,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		print '<br>';
 
 		if (!empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
-		print '<label for="checkboxcreatefromfetching"><span class="opacitymedium">'.$langs->trans("CreateByFetchingExternalPage").'</span></label><br>';
+		print '<label for="checkboxcreatefromfetching"><span class="opacitymediumxx">'.$langs->trans("CreateByFetchingExternalPage").'</span></label><br>';
 		print '<hr class="tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
 		print '<table class="tableforfield centpercent tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
 		print '<tr><td class="titlefield">';
@@ -2912,7 +2924,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		print '<br>';
 
 		if (!empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
-		print '<label for="checkboxcreatemanually"><span class="opacitymedium">'.$langs->trans("OrEnterPageInfoManually").'</span></label><br>';
+		print '<label for="checkboxcreatemanually"><span class="opacitymediumxx">'.$langs->trans("OrEnterPageInfoManually").'</span></label><br>';
 		print '<hr class="tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 	}
 
@@ -3015,7 +3027,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '<tr><td>';
 	print $langs->trans('Language');
 	print '</td><td>';
-	print $formadmin->select_language($pagelang ? $pagelang : $langs->defaultlang, 'WEBSITE_LANG', 0, null, '1');
+	print $formadmin->select_language($pagelang ? $pagelang : $langs->defaultlang, 'WEBSITE_LANG', 0, null, '1', 0, 0, 'minwidth200');
 	print '</td></tr>';
 
 	// Translation of
@@ -3034,17 +3046,23 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 			$num_rows = $db->num_rows($resql);
 			if ($num_rows > 0)
 			{
-				print '<span class="opacitymedium">'.$langs->trans('ThisPageHasTranslationPages').':</span><br>';
+				print '<span class="opacitymedium">'.$langs->trans('ThisPageHasTranslationPages').':</span>';
 				$i = 0;
+				$tmppage = new WebsitePage($db);
+				$tmpstring = '';
 				while ($obj = $db->fetch_object($resql))
 				{
-					$tmppage = new WebsitePage($db);
-					$tmppage->fetch($obj->rowid);
-					if ($i > 0) print ' - ';
-					print $tmppage->getNomUrl(1).' ('.$tmppage->lang.')<br>';
-					$translatedby++;
-					$i++;
+					$result = $tmppage->fetch($obj->rowid);
+					if ($result > 0) {
+						if ($i > 0) $tmpstring .= '<br>';
+						$tmpstring .= $tmppage->getNomUrl(1).' ('.$tmppage->lang.')';
+						$translatedby++;
+						$i++;
+					}
 				}
+				if ($i > 1) print '<br>';
+				else print ' ';
+				print $tmpstring;
 			}
 		}
 		else dol_print_error($db);
@@ -3059,10 +3077,12 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		}
 		elseif ($result > 0)
 		{
-			$translationof = 0;
-			//$translationof = $sourcepage->id;
+			$translationof = $objectpage->fk_page;
 			print '<span class="opacitymedium">'.$langs->trans('ThisPageIsTranslationOf').'</span> ';
-			print $formwebsite->selectContainer($website, 'pageidfortranslation', $translationof, 1, $action, 'minwidth300');
+			print $formwebsite->selectContainer($website, 'pageidfortranslation', ($translationof ? $translationof : -1), 1, $action, 'minwidth300', array($objectpage->id));
+			if ($translationof > 0) {
+				print $sourcepage->getNomUrl(2).' ('.$sourcepage->lang.')';
+			}
 		}
 	}
 	print '</td></tr>';
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index e6c5b0f7c3d..2241b128dee 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -61,7 +61,7 @@ foreach ($object->fields as $key => $val)
 if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'website', $id);
 
diff --git a/htdocs/zapier/hook_agenda.php b/htdocs/zapier/hook_agenda.php
index 98812cd47b5..e3cbc1a21d6 100644
--- a/htdocs/zapier/hook_agenda.php
+++ b/htdocs/zapier/hook_agenda.php
@@ -66,7 +66,7 @@ else
 $search_agenda_label=GETPOST('search_agenda_label');
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $id);
 
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
index 1ea85ce8d57..1070a02af9d 100644
--- a/htdocs/zapier/hook_card.php
+++ b/htdocs/zapier/hook_card.php
@@ -99,7 +99,7 @@ if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->statut == MyObject::STATUS_DRAFT) ? 1 : 0);
 //$result = restrictedArea($user, 'mymodule', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
diff --git a/htdocs/zapier/hook_document.php b/htdocs/zapier/hook_document.php
index 67d438c106b..966a2b138cf 100644
--- a/htdocs/zapier/hook_document.php
+++ b/htdocs/zapier/hook_document.php
@@ -54,7 +54,7 @@ $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'))
 $ref = GETPOST('ref', 'alpha');
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $id);
 
diff --git a/htdocs/zapier/hook_note.php b/htdocs/zapier/hook_note.php
index c56b36be33e..abb66fd6f38 100644
--- a/htdocs/zapier/hook_note.php
+++ b/htdocs/zapier/hook_note.php
@@ -60,7 +60,7 @@ $hookmanager->initHooks(array('myobjectnote', 'globalcard')); // Note that conf-
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Security check - Protection if external user
-//if ($user->socid > 0) access_forbidden();
+//if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $id);