From 907ae36cdffde5b34f2651252bba69bf7e72907d Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Sun, 15 Oct 2017 17:58:22 +0200
Subject: [PATCH 01/86] Add insert, update and delete methods to line class

Cleanup properties
Add insert, line and delete methods
---
 htdocs/expedition/class/expedition.class.php | 356 ++++++++++++++++++-
 1 file changed, 346 insertions(+), 10 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index cf1c7afad9c..fee155a59de 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2235,13 +2235,30 @@ class Expedition extends CommonObject
  */
 class ExpeditionLigne extends CommonObjectLine
 {
-	var $db;
+	public $element='expeditiondet';
+	public $table_element='expeditiondet';
+
+	public $fk_origin_line;
+
+	/**
+	 * Id of shipment
+	 * @var int
+	 */
+	public $fk_expedition;
+
+	var $db;	
 
 	// From llx_expeditiondet
 	var $qty;
 	var $qty_shipped;
 	var $fk_product;
 	var $detail_batch;
+	/**
+	 * Id of warehouse
+	 * @var int
+	 */
+	public $entrepot_id;
+	
 
 	// From llx_commandedet or llx_propaldet
 	var $qty_asked;
@@ -2258,10 +2275,7 @@ class ExpeditionLigne extends CommonObjectLine
 	var $total_localtax1;   // Total Local tax 1
 	var $total_localtax2;   // Total Local tax 2
 
-	public $element='expeditiondet';
-	public $table_element='expeditiondet';
-
-	public $fk_origin_line;
+	
 
 	// Deprecated
 	/**
@@ -2280,15 +2294,337 @@ class ExpeditionLigne extends CommonObjectLine
 	 */
 	var $libelle;
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
 	function __construct($db)
 	{
 		$this->db=$db;
 	}
 
+	/**
+	 *	Insert line into database
+	 *
+	 *	@param      User	$user        	User that modify
+	 *	@param      int		$notrigger		1 = disable triggers
+	 *	@return		int						<0 if KO, line id >0 if OK
+	 */
+	function insert($user=null, $notrigger=0)
+	{
+		global $langs, $conf;
+
+		$error=0;
+
+		// Check parameters
+		if (empty($this->fk_expedition) || empty($this->fk_origin_line) || empty($this->qty))
+		{
+			$this->errors[] = 'ErrorMandatoryParametersNotProvided';
+			return -1;
+		}
+        // Clean parameters
+        if (empty($this->entrepot_id)) $this->entrepot_id='null';
+
+        $this->db->begin();
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expeditiondet (";
+		$sql.= "fk_expedition";
+		$sql.= ", fk_entrepot";
+		$sql.= ", fk_origin_line";
+		$sql.= ", qty";
+		$sql.= ") VALUES (";
+		$sql.= $this->id;
+		$sql.= ", ".$this->entrepot_id;
+		$sql.= ", ".$this->origin_line_id;
+		$sql.= ", ".$this->qty;
+		$sql.= ")";
+
+		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$this->id=$this->rowid;
+				$result=$this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+
+            if (! $error && ! $notrigger)
+            {
+	            // Call trigger
+	            $result=$this->call_trigger('LINESHIPMENT_INSERT',$user);
+	            if ($result < 0) $error++;
+	            // End call triggers
+            }
+
+	        if (!$error) {
+		        $this->db->commit();
+		        return $this->id;
+	        }
+
+	        foreach($this->errors as $errmsg)
+	        {
+		        dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+		        $this->error.=($this->error?', '.$errmsg:$errmsg);
+	        }
+	        $this->db->rollback();
+	        return -1*$error;
+		}
+		else
+		{
+			$error++;
+		}
+
+		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		{
+			$expeditionline = new ExpeditionLigne($this->db);
+			$expeditionline->array_options=$array_options;
+			$expeditionline->id= $this->db->last_insert_id(MAIN_DB_PREFIX.$expeditionline->table_element);
+			$result=$expeditionline->insertExtraFields();
+			if ($result < 0)
+			{
+				$this->error[]=$expeditionline->error;
+				$error++;
+			}
+		}
+
+		if (! $error) return $line_id;
+		else return -1;
+
+		// ////////////////////
+
+        dol_syslog(get_class($this)."::insert", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'commandedet');
+
+			
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            $this->db->rollback();
+            return -2;
+        }
+    }
+
+	/**
+	 * 	Delete shipment line.
+	 *  
+	 * 	@return		int		>0 if OK, <0 if KO
+	 */
+	function delete()
+	{
+		global $conf;
+
+		$this->db->begin();
+				
+		// delete batch expedition line
+		if ($conf->productbatch->enabled)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
+			$sql.= " WHERE fk_expeditiondet = ".$this->id;
+
+			if (!$this->db->query($sql))
+			{
+				$this->errors[]=$this->db->lasterror()." - sql=$sql";
+				$this->db->rollback();
+				return -2;
+			}
+		}
+		
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
+		$sql.= " WHERE rowid = ".$this->id;
+
+		if ( $this->db->query($sql))
+		{
+			// Remove extrafields
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			{
+				$result=$this->deleteExtraFields();
+				if ($result < 0)
+				{
+					$this->errors[]=$this->error;
+					$this->db->rollback();
+					return -4;
+				}
+				else
+				{
+					$this->db->commit();
+					return 1;
+				}
+			} 
+			else 
+			{
+				$this->db->commit();
+				return 1;
+			}
+		}
+		else
+		{
+			$this->errors[]=$this->db->lasterror()." - sql=$sql";
+			$this->db->rollback();
+			return -3;
+		}
+	}
+	
+	/**
+	 *  Update a line in database
+	 *
+	 *  @return		int					< 0 if KO, > 0 if OK
+	 */
+	function update()
+    {
+        global $conf;
+
+        dol_syslog(get_class($this)."::update id=$this->id, entrepot_id=$this->entrepot_id, product_id=$this->fk_product, qty=$this->qty");
+        
+    	// Add a protection to refuse deleting if shipment is not in draft status
+		if (! isset($this->id) || ! isset($this->entrepot_id))
+		{
+			dol_syslog(get_class($this).'::update missing line id and/or warehouse id', LOG_ERR);
+			$this->errors[]='ErrorBadParameters';
+			return -1;
+		}
+        
+        $this->db->begin();
+
+        // Clean parameters
+        if (empty($this->qty)) $this->qty=0;
+        $qty=price2num($this->qty);
+        $remainingQty = 0;
+        $batch = null;
+        $batch_id = null;
+        if (is_array($this->detail_batch)) 
+        {
+        	if (count($this->detail_batch) > 1) 
+        	{
+        		dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
+        		$this->errors[]='ErrorBadParameters';
+				return -7;
+        	}
+        	else
+        	{
+        		$batch = $this->detail_batch[0]->batch;
+        		$batch_id = $this->detail_batch[0]->fk_origin_stock;
+        	}
+        }
+        else
+        {
+        	$batch = $this->detail_batch->batch;
+        	$batch_id = $this->detail_batch->fk_origin_stock;
+        }
+
+		// update lot
+
+		if (!empty($batch) && $conf->productbatch->enabled)
+		{
+			if (empty($batch_id) || empty($this->fk_product)) {
+				dol_syslog(get_class($this).'::update missing fk_origin_stock (batch_id) and/or fk_product', LOG_ERR);
+        		$this->errors[]='ErrorBadParameters';
+				return -8;
+			}
+			
+			// fetch remaining lot qty
+			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+			if (($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0)
+			{
+				$this->errors[]=$this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
+				$this->db->rollback();
+				return -4;
+			}	
+			foreach ($lotArray as $lot) 
+			{
+				if ($batch != $lot->batch) 
+				{
+					$remainingQty += $lot->dluo_qty;
+				}
+			}
+			
+			//fetch lot details
+			
+			// fetch from product_lot
+			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
+			$lot = new Productlot($this->db);
+			if ($lot->fetch(0,$this->fk_product,$batch) < 0) 
+			{
+				$this->errors[] = $lot->errors;
+				return -3;
+			}
+			
+			// delete lot expedition line
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
+			$sql.= " WHERE fk_expeditiondet = ".$this->id;
+			$sql.= " AND batch = '".$this->db->escape($batch)."'";
+
+			if (!$this->db->query($sql))
+			{
+				$this->errors[]=$this->db->lasterror()." - sql=$sql";
+				$this->db->rollback();
+				return -2;
+			}
+						
+			if ($qty > 0) {
+				if (isset($lot->id)) 
+				{
+					$shipmentLot = new ExpeditionLineBatch($this->db);
+					$shipmentLot->batch = $lot->batch;
+					$shipmentLot->eatby = $lot->eatby;
+					$shipmentLot->sellby = $lot->sellby;
+					$shipmentLot->entrepot_id = $this->entrepot_id;
+					$shipmentLot->dluo_qty = $qty;
+					$shipmentLot->fk_origin_stock = $batch_id;
+					if ($shipmentLot->create($this->id) < 0) 
+					{
+						$this->errors[]=$shipmentLot->errors;
+						$this->db->rollback();
+						return -6;
+					}
+				}
+			}
+		}
+
+		// update line
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= " fk_entrepot = ".$this->entrepot_id;
+		$sql.= " , qty = ".($qty + $remainingQty);
+		$sql.= " WHERE rowid = ".$this->id;
+		
+		if (!$this->db->query($sql)) 
+		{
+			$this->errors[]=$this->db->lasterror()." - sql=$sql";
+			$this->db->rollback();
+			return -5;
+		}
+		
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+		{
+			$this->id=$this->rowid;
+			$result=$this->insertExtraFields();
+			if ($result < 0)
+			{
+				$this->errors[]=$this->error;
+				$this->db->rollback();
+				return -4;
+			}
+			else
+			{
+				$this->db->commit();
+				return 1;
+			}
+		} 
+		else 
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
 }
 

From 6b557fd92f75e4ce8783f2ed647658472e87546a Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 17 Oct 2017 22:19:45 +0200
Subject: [PATCH 02/86] Fix old batches not displayed in multi warehouse
 shipping

Old batches not available in product_lot table are not shown for
shipping from multiple warehouses
---
 htdocs/expedition/card.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index f0aaad677d6..6bd275d94d2 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1212,11 +1212,16 @@ if ($action == 'create')
 
 									print '<!-- Show details of lot -->';
 									print '<input name="batchl'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$dbatch->id.'">';
-									//print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
 									$productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
-									print $langs->trans("Batch").': '.$productlotObject->getNomUrl(1);
-									print ' ('.$dbatch->qty.')';
-									//print $langs->trans("DetailBatchFormat", 'ee'.$dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
+									if (!empty($productlotObject->batch)) 
+									{
+										print $langs->trans("Batch").': '.$productlotObject->getNomUrl(1);
+										print ' ('.$dbatch->qty.')';
+									}
+									else
+									{
+										print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
+									}
 									$quantityToBeDelivered -= $deliverableQty;
 									if ($quantityToBeDelivered < 0)
 									{

From 2ea687a60b380e3f58fdb3f1865382d693f1f799 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Wed, 18 Oct 2017 17:01:17 +0200
Subject: [PATCH 03/86] Add Line triggers, Improve line error handling, ...

Add triggers,
Improve line error handling,
use line->insert in create_line
---
 htdocs/expedition/class/expedition.class.php | 426 +++++++++----------
 1 file changed, 202 insertions(+), 224 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index fee155a59de..05f6c9e57d3 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2014-2015  Francis Appels          <francis.appels@yahoo.com>
+ * Copyright (C) 2014-2017  Francis Appels          <francis.appels@yahoo.com>
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  *
@@ -373,48 +373,18 @@ class Expedition extends CommonObject
 	 */
 	function create_line($entrepot_id, $origin_line_id, $qty,$array_options=0)
 	{
-		global $conf;
-		$error = 0;
-		$line_id = 0;
+		$expeditionline = new ExpeditionLigne($this->db);
+		$expeditionline->fk_expedition = $this->id;
+		$expeditionline->entrepot_id = $entrepot_id;
+		$expeditionline->fk_origin_line = $origin_line_id;
+		$expeditionline->qty = $qty;
+		$expeditionline->$array_options = $array_options;
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expeditiondet (";
-		$sql.= "fk_expedition";
-		$sql.= ", fk_entrepot";
-		$sql.= ", fk_origin_line";
-		$sql.= ", qty";
-		$sql.= ") VALUES (";
-		$sql.= $this->id;
-		$sql.= ", ".($entrepot_id?$entrepot_id:'null');
-		$sql.= ", ".$origin_line_id;
-		$sql.= ", ".$qty;
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::create_line", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
+		if (($lineId = $expeditionline->insert()) < 0)
 		{
-			$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
+			$this->error[]=$expeditionline->error;
 		}
-		else
-		{
-			$error++;
-		}
-
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
-		{
-			$expeditionline = new ExpeditionLigne($this->db);
-			$expeditionline->array_options=$array_options;
-			$expeditionline->id= $this->db->last_insert_id(MAIN_DB_PREFIX.$expeditionline->table_element);
-			$result=$expeditionline->insertExtraFields();
-			if ($result < 0)
-			{
-				$this->error[]=$expeditionline->error;
-				$error++;
-			}
-		}
-
-		if (! $error) return $line_id;
-		else return -1;
+		return $lineId;
 	}
 
 
@@ -2307,7 +2277,7 @@ class ExpeditionLigne extends CommonObjectLine
 	/**
 	 *	Insert line into database
 	 *
-	 *	@param      User	$user        	User that modify
+	 *	@param      User	$user			User that modify
 	 *	@param      int		$notrigger		1 = disable triggers
 	 *	@return		int						<0 if KO, line id >0 if OK
 	 */
@@ -2323,10 +2293,10 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->errors[] = 'ErrorMandatoryParametersNotProvided';
 			return -1;
 		}
-        // Clean parameters
-        if (empty($this->entrepot_id)) $this->entrepot_id='null';
+		// Clean parameters
+		if (empty($this->entrepot_id)) $this->entrepot_id='null';
 
-        $this->db->begin();
+		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expeditiondet (";
 		$sql.= "fk_expedition";
@@ -2334,9 +2304,9 @@ class ExpeditionLigne extends CommonObjectLine
 		$sql.= ", fk_origin_line";
 		$sql.= ", qty";
 		$sql.= ") VALUES (";
-		$sql.= $this->id;
+		$sql.= $this->fk_expedition;
 		$sql.= ", ".$this->entrepot_id;
-		$sql.= ", ".$this->origin_line_id;
+		$sql.= ", ".$this->fk_origin_line;
 		$sql.= ", ".$this->qty;
 		$sql.= ")";
 
@@ -2347,7 +2317,6 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 			{
-				$this->id=$this->rowid;
 				$result=$this->insertExtraFields();
 				if ($result < 0)
 				{
@@ -2355,75 +2324,50 @@ class ExpeditionLigne extends CommonObjectLine
 				}
 			}
 
-            if (! $error && ! $notrigger)
-            {
-	            // Call trigger
-	            $result=$this->call_trigger('LINESHIPMENT_INSERT',$user);
-	            if ($result < 0) $error++;
-	            // End call triggers
-            }
+			if (! $error && ! $notrigger)
+			{
+				// Call trigger
+				$result=$this->call_trigger('LINESHIPPING_INSERT',$user);
+				if ($result < 0)
+				{
+					$this->errors[]=$this->error;
+					$error++;
+				}
+				// End call triggers
+			}
 
-	        if (!$error) {
-		        $this->db->commit();
-		        return $this->id;
-	        }
+			if (! $error) {
+				$this->db->commit();
+				return $this->id;
+			}
 
-	        foreach($this->errors as $errmsg)
-	        {
-		        dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-		        $this->error.=($this->error?', '.$errmsg:$errmsg);
-	        }
-	        $this->db->rollback();
-	        return -1*$error;
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
 		}
 		else
 		{
 			$error++;
 		}
-
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
-		{
-			$expeditionline = new ExpeditionLigne($this->db);
-			$expeditionline->array_options=$array_options;
-			$expeditionline->id= $this->db->last_insert_id(MAIN_DB_PREFIX.$expeditionline->table_element);
-			$result=$expeditionline->insertExtraFields();
-			if ($result < 0)
-			{
-				$this->error[]=$expeditionline->error;
-				$error++;
-			}
-		}
-
-		if (! $error) return $line_id;
-		else return -1;
-
-		// ////////////////////
-
-        dol_syslog(get_class($this)."::insert", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->rowid=$this->db->last_insert_id(MAIN_DB_PREFIX.'commandedet');
-
-			
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
+	}
 
 	/**
 	 * 	Delete shipment line.
 	 *  
+	 *	@param		User	$user			User that modify
+	 *	@param		int		$notrigger		0=launch triggers after, 1=disable triggers
 	 * 	@return		int		>0 if OK, <0 if KO
 	 */
-	function delete()
+	function delete($user = null, $notrigger = 0)
 	{
 		global $conf;
 
+		$error=0;
+
 		$this->db->begin();
 				
 		// delete batch expedition line
@@ -2435,15 +2379,14 @@ class ExpeditionLigne extends CommonObjectLine
 			if (!$this->db->query($sql))
 			{
 				$this->errors[]=$this->db->lasterror()." - sql=$sql";
-				$this->db->rollback();
-				return -2;
+				$error++;
 			}
 		}
 		
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
 		$sql.= " WHERE rowid = ".$this->id;
 
-		if ( $this->db->query($sql))
+		if (! $error && $this->db->query($sql))
 		{
 			// Remove extrafields
 			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
@@ -2452,26 +2395,40 @@ class ExpeditionLigne extends CommonObjectLine
 				if ($result < 0)
 				{
 					$this->errors[]=$this->error;
-					$this->db->rollback();
-					return -4;
+					$error++;
 				}
-				else
-				{
-					$this->db->commit();
-					return 1;
-				}
-			} 
-			else 
+			}
+			if (! $error && ! $notrigger) 
 			{
-				$this->db->commit();
-				return 1;
+				// Call trigger
+				$result=$this->call_trigger('LINESHIPPING_DELETE',$user);
+				if ($result < 0)
+				{
+					$this->errors[]=$this->error;
+					$error++;
+				}
+				// End call triggers
 			}
 		}
 		else
 		{
 			$this->errors[]=$this->db->lasterror()." - sql=$sql";
+			$error++;
+		}
+
+		if (! $error) {
+			$this->db->commit();
+			return 1;
+		}
+		else 
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
 			$this->db->rollback();
-			return -3;
+			return -1*$error;
 		}
 	}
 	
@@ -2480,151 +2437,172 @@ class ExpeditionLigne extends CommonObjectLine
 	 *
 	 *  @return		int					< 0 if KO, > 0 if OK
 	 */
-	function update()
-    {
-        global $conf;
+	function update($user = null, $notrigger = 0)
+	{
+		global $conf;
+		
+		$error=0;
 
-        dol_syslog(get_class($this)."::update id=$this->id, entrepot_id=$this->entrepot_id, product_id=$this->fk_product, qty=$this->qty");
-        
-    	// Add a protection to refuse deleting if shipment is not in draft status
+		dol_syslog(get_class($this)."::update id=$this->id, entrepot_id=$this->entrepot_id, product_id=$this->fk_product, qty=$this->qty");
+
+		// check parameters
 		if (! isset($this->id) || ! isset($this->entrepot_id))
 		{
 			dol_syslog(get_class($this).'::update missing line id and/or warehouse id', LOG_ERR);
-			$this->errors[]='ErrorBadParameters';
+			$this->errors[]='ErrorMandatoryParametersNotProvided';
+			$error++;
 			return -1;
 		}
-        
-        $this->db->begin();
 
-        // Clean parameters
-        if (empty($this->qty)) $this->qty=0;
-        $qty=price2num($this->qty);
-        $remainingQty = 0;
-        $batch = null;
-        $batch_id = null;
-        if (is_array($this->detail_batch)) 
-        {
-        	if (count($this->detail_batch) > 1) 
-        	{
-        		dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
-        		$this->errors[]='ErrorBadParameters';
-				return -7;
-        	}
-        	else
-        	{
-        		$batch = $this->detail_batch[0]->batch;
-        		$batch_id = $this->detail_batch[0]->fk_origin_stock;
-        	}
-        }
-        else
-        {
-        	$batch = $this->detail_batch->batch;
-        	$batch_id = $this->detail_batch->fk_origin_stock;
-        }
+		$this->db->begin();
+
+		// Clean parameters
+		if (empty($this->qty)) $this->qty=0;
+		$qty=price2num($this->qty);
+		$remainingQty = 0;
+		$batch = null;
+		$batch_id = null;
+		if (is_array($this->detail_batch)) 
+		{
+			if (count($this->detail_batch) > 1) 
+			{
+				dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
+				$this->errors[]='ErrorBadParameters';
+				$error++;
+			}
+			else
+			{
+				$batch = $this->detail_batch[0]->batch;
+				$batch_id = $this->detail_batch[0]->fk_origin_stock;
+			}
+		}
+		else
+		{
+			$batch = $this->detail_batch->batch;
+			$batch_id = $this->detail_batch->fk_origin_stock;
+		}
 
 		// update lot
 
-		if (!empty($batch) && $conf->productbatch->enabled)
+		if (! empty($batch) && $conf->productbatch->enabled)
 		{
 			if (empty($batch_id) || empty($this->fk_product)) {
 				dol_syslog(get_class($this).'::update missing fk_origin_stock (batch_id) and/or fk_product', LOG_ERR);
-        		$this->errors[]='ErrorBadParameters';
-				return -8;
+				$this->errors[]='ErrorMandatoryParametersNotProvided';
+				$error++;
 			}
-			
+
 			// fetch remaining lot qty
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 			if (($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0)
 			{
 				$this->errors[]=$this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
-				$this->db->rollback();
-				return -4;
-			}	
-			foreach ($lotArray as $lot) 
+				$error++;
+			}
+			else 
 			{
-				if ($batch != $lot->batch) 
+				foreach ($lotArray as $lot) 
 				{
-					$remainingQty += $lot->dluo_qty;
-				}
-			}
-			
-			//fetch lot details
-			
-			// fetch from product_lot
-			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
-			$lot = new Productlot($this->db);
-			if ($lot->fetch(0,$this->fk_product,$batch) < 0) 
-			{
-				$this->errors[] = $lot->errors;
-				return -3;
-			}
-			
-			// delete lot expedition line
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
-			$sql.= " WHERE fk_expeditiondet = ".$this->id;
-			$sql.= " AND batch = '".$this->db->escape($batch)."'";
-
-			if (!$this->db->query($sql))
-			{
-				$this->errors[]=$this->db->lasterror()." - sql=$sql";
-				$this->db->rollback();
-				return -2;
-			}
-						
-			if ($qty > 0) {
-				if (isset($lot->id)) 
-				{
-					$shipmentLot = new ExpeditionLineBatch($this->db);
-					$shipmentLot->batch = $lot->batch;
-					$shipmentLot->eatby = $lot->eatby;
-					$shipmentLot->sellby = $lot->sellby;
-					$shipmentLot->entrepot_id = $this->entrepot_id;
-					$shipmentLot->dluo_qty = $qty;
-					$shipmentLot->fk_origin_stock = $batch_id;
-					if ($shipmentLot->create($this->id) < 0) 
+					if ($batch != $lot->batch) 
 					{
-						$this->errors[]=$shipmentLot->errors;
-						$this->db->rollback();
-						return -6;
+						$remainingQty += $lot->dluo_qty;
+					}
+				}
+				
+				//fetch lot details
+				
+				// fetch from product_lot
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
+				$lot = new Productlot($this->db);
+				if ($lot->fetch(0,$this->fk_product,$batch) < 0) 
+				{
+					$this->errors[] = $lot->errors;
+					$error++;
+				}
+				else
+				{
+					// delete lot expedition line
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
+					$sql.= " WHERE fk_expeditiondet = ".$this->id;
+					$sql.= " AND batch = '".$this->db->escape($batch)."'";
+		
+					if (!$this->db->query($sql))
+					{
+						$this->errors[]=$this->db->lasterror()." - sql=$sql";
+						$error++;
+					}
+					else if ($qty > 0) 
+					{
+						if (isset($lot->id)) 
+						{
+							$shipmentLot = new ExpeditionLineBatch($this->db);
+							$shipmentLot->batch = $lot->batch;
+							$shipmentLot->eatby = $lot->eatby;
+							$shipmentLot->sellby = $lot->sellby;
+							$shipmentLot->entrepot_id = $this->entrepot_id;
+							$shipmentLot->dluo_qty = $qty;
+							$shipmentLot->fk_origin_stock = $batch_id;
+							if ($shipmentLot->create($this->id) < 0) 
+							{
+								$this->errors[]=$shipmentLot->errors;
+								$error++;
+							}
+						}
 					}
 				}
 			}
 		}
-
-		// update line
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-		$sql.= " fk_entrepot = ".$this->entrepot_id;
-		$sql.= " , qty = ".($qty + $remainingQty);
-		$sql.= " WHERE rowid = ".$this->id;
-		
-		if (!$this->db->query($sql)) 
+		if (! $error)
 		{
-			$this->errors[]=$this->db->lasterror()." - sql=$sql";
-			$this->db->rollback();
-			return -5;
-		}
-		
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-		{
-			$this->id=$this->rowid;
-			$result=$this->insertExtraFields();
-			if ($result < 0)
+			// update line
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+			$sql.= " fk_entrepot = ".$this->entrepot_id;
+			$sql.= " , qty = ".($qty + $remainingQty);
+			$sql.= " WHERE rowid = ".$this->id;
+			
+			if (!$this->db->query($sql)) 
 			{
-				$this->errors[]=$this->error;
-				$this->db->rollback();
-				return -4;
+				$this->errors[]=$this->db->lasterror()." - sql=$sql";
+				$error++;
 			}
 			else
 			{
-				$this->db->commit();
-				return 1;
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				{
+					$result=$this->insertExtraFields();
+					if ($result < 0)
+					{
+						$this->errors[]=$this->error;
+						$error++;
+					}
+				}
 			}
-		} 
-		else 
+		}
+		if (! $error && ! $notrigger) 
 		{
+			// Call trigger
+			$result=$this->call_trigger('LINESHIPPING_UPDATE',$user);
+			if ($result < 0)
+			{
+				$this->errors[]=$this->error;
+				$error++;
+			}
+			// End call triggers
+		}
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		}
+		else 
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
 	}
 }
 

From 146f17faa6bacf55066d4a222582fb97eed784b4 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Wed, 18 Oct 2017 18:18:17 +0200
Subject: [PATCH 04/86] Add delete line to expedition card

---
 htdocs/expedition/card.php | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 9fa609d9d76..bc647c31999 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -69,6 +69,7 @@ $id = $origin_id;
 if (empty($origin_id)) $origin_id  = GETPOST('origin_id','int');    // Id of order or propal
 if (empty($origin_id)) $origin_id  = GETPOST('object_id','int');    // Id of order or propal
 $ref=GETPOST('ref','alpha');
+$line_id = GETPOST('lineid','int')?GETPOST('lineid','int'):'';
 
 // Security check
 $socid='';
@@ -596,6 +597,18 @@ if (empty($reshook))
 	    }
 	}
 
+	elseif ($action == 'deleteline' && ! empty($line_id))
+	{
+		$object->fetch($id);
+		$line = new ExpeditionLigne($db);
+		$line->id = $line_id;
+		$result = $line->delete($user);
+		if($result >= 0) {
+			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			exit();
+		}
+	}
+
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
@@ -1769,6 +1782,8 @@ else if ($id || $ref)
 			print '<td align="left">'.$langs->trans("Batch").'</td>';
 		}
 
+		print '<td class="linecoledit"></td>';
+		print '<td class="linecoldelete" width="10"></td>';
 		print "</tr>\n";
 
 		$var=false;
@@ -1992,6 +2007,18 @@ else if ($id || $ref)
 					print '<td></td>';
 				}
 			}
+
+			// edit-delete buttons
+			print '<td class="linecoledit" align="center">';
+			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">';
+			print img_edit();
+			print '</a>';
+			print '</td>';
+			print '<td class="linecoldelete" width="10">';
+			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">';
+			print img_delete();
+			print '</a>';
+			print '</td>';
 			print "</tr>";
 
 			// Display lines extrafields
@@ -2003,8 +2030,6 @@ else if ($id || $ref)
 				print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 				print '</tr>';
 			}
-
-
 		}
 
 		// TODO Show also lines ordered but not delivered

From 3793ae323a8bf3ad7521cd272db6f3e8ba2d3f23 Mon Sep 17 00:00:00 2001
From: gauthier <gauthier.verdol@atm-consulting.fr>
Date: Thu, 19 Oct 2017 09:46:19 +0200
Subject: [PATCH 05/86] FIX : wrong personnal project time spent

---
 htdocs/core/lib/project.lib.php    | 2 +-
 htdocs/projet/class/task.class.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index fa3967284d9..b70e037cbf4 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -762,7 +762,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 
 				// Time spent by user
 				print '<td align="right">';
-				$tmptimespent=$taskstatic->getSummaryOfTimeSpent();
+				$tmptimespent=$taskstatic->getSummaryOfTimeSpent('', $fuser->id);
 				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'],'allhourmin');
 				else print '--:--';
 				print "</td>\n";
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index ca8ed73e10d..ae257d6eff4 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -911,9 +911,10 @@ class Task extends CommonObject
      *  Calculate total of time spent for task
      *
      *  @param	int		$id 		Id of object (here task)
+     *  @param	int		$user_id	Filter on user time
      *  @return array		        Array of info for task array('min_date', 'max_date', 'total_duration')
      */
-    function getSummaryOfTimeSpent($id='')
+    function getSummaryOfTimeSpent($id='', $user_id='')
     {
         global $langs;
 
@@ -927,6 +928,7 @@ class Task extends CommonObject
         $sql.= " SUM(t.task_duration) as total_duration";
         $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
         $sql.= " WHERE t.fk_task = ".$id;
+        if(!empty($user_id)) $sql.= " AND t.fk_user = ".$user_id;
 
         dol_syslog(get_class($this)."::getSummaryOfTimeSpent", LOG_DEBUG);
         $resql=$this->db->query($sql);

From 75580f253e93898c49ff8635bf23741fb5ac02a5 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 20 Oct 2017 12:57:32 +0200
Subject: [PATCH 06/86] FIX: Agenda events are not exported in the ICAL, VCAL
 if begin exactly with the same $datestart

---
 htdocs/comm/action/class/actioncomm.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 375365eaf41..c111b8861a6 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -2,8 +2,8 @@
 /* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2011-2017 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015	   Marcos García		<marcosgdf@gmail.com>
  *
  * 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
@@ -1255,6 +1255,7 @@ class ActionComm extends CommonObject
             {
                 // Note: Output of sql request is encoded in $conf->file->character_set_client
                 // This assignment in condition is not a bug. It allows walking the results.
+				$diff = 0;
                 while ($obj=$this->db->fetch_object($resql))
                 {
                     $qualified=true;
@@ -1289,8 +1290,9 @@ class ActionComm extends CommonObject
 
                     if ($qualified && $datestart)
                     {
-                        $eventarray[$datestart]=$event;
+                        $eventarray[$datestart+$diff]=$event;
                     }
+                    $diff++;
                 }
             }
             else

From 6571083a78960f76d7bb52fdc67dfaac55356ae0 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Mon, 23 Oct 2017 22:16:00 +0200
Subject: [PATCH 07/86] Add line id to detail_entrepot object

Add line id to detail_entrepot object.
Add expedition batch id to update batch in line update
---
 htdocs/expedition/class/expedition.class.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 05f6c9e57d3..f97de9b8b5a 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1336,6 +1336,7 @@ class Expedition extends CommonObject
 				$detail_entrepot              = new stdClass;
 				$detail_entrepot->entrepot_id = $obj->fk_entrepot;
 				$detail_entrepot->qty_shipped = $obj->qty_shipped;
+				$detail_entrepot->line_id     = $obj->line_id;
 				$line->details_entrepot[]     = $detail_entrepot;
 
 				$line->line_id          = $obj->line_id;
@@ -2462,6 +2463,7 @@ class ExpeditionLigne extends CommonObjectLine
 		$remainingQty = 0;
 		$batch = null;
 		$batch_id = null;
+		$expedition_batch_id = null;
 		if (is_array($this->detail_batch)) 
 		{
 			if (count($this->detail_batch) > 1) 
@@ -2474,19 +2476,23 @@ class ExpeditionLigne extends CommonObjectLine
 			{
 				$batch = $this->detail_batch[0]->batch;
 				$batch_id = $this->detail_batch[0]->fk_origin_stock;
+				$expedition_batch_id = $this->detail_batch[0]->id;
 			}
 		}
 		else
 		{
 			$batch = $this->detail_batch->batch;
 			$batch_id = $this->detail_batch->fk_origin_stock;
+			$expedition_batch_id = $this->detail_batch->id;
 		}
 
 		// update lot
 
 		if (! empty($batch) && $conf->productbatch->enabled)
 		{
-			if (empty($batch_id) || empty($this->fk_product)) {
+			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");			
+			
+			if (empty($batch_id) || empty($expedition_batch_id) || empty($this->fk_product)) {
 				dol_syslog(get_class($this).'::update missing fk_origin_stock (batch_id) and/or fk_product', LOG_ERR);
 				$this->errors[]='ErrorMandatoryParametersNotProvided';
 				$error++;
@@ -2503,7 +2509,7 @@ class ExpeditionLigne extends CommonObjectLine
 			{
 				foreach ($lotArray as $lot) 
 				{
-					if ($batch != $lot->batch) 
+					if ($expedition_batch_id != $lot->id) 
 					{
 						$remainingQty += $lot->dluo_qty;
 					}
@@ -2524,7 +2530,7 @@ class ExpeditionLigne extends CommonObjectLine
 					// delete lot expedition line
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
 					$sql.= " WHERE fk_expeditiondet = ".$this->id;
-					$sql.= " AND batch = '".$this->db->escape($batch)."'";
+					$sql.= " AND rowid = ".$expedition_batch_id;
 		
 					if (!$this->db->query($sql))
 					{

From 5342785a4973c1e3d35be59704ec77f399876e1f Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Mon, 23 Oct 2017 22:16:40 +0200
Subject: [PATCH 08/86] Add entrepot id to expedition batch fetchAll

---
 .../class/expeditionbatch.class.php           | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 5253156e32a..c0a2decd93d 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -177,15 +177,18 @@ class ExpeditionLineBatch extends CommonObject
 	 */
 	static function fetchAll($db,$id_line_expdet)
 	{
-		$sql="SELECT rowid,";
-		$sql.= "fk_expeditiondet";
-		$sql.= ", sellby";
-		$sql.= ", eatby";
-		$sql.= ", batch";
-		$sql.= ", qty";
-		$sql.= ", fk_origin_stock";
-		$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element;
-		$sql.= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
+		$sql="SELECT t.rowid";
+		$sql.= ", t.fk_expeditiondet";
+		$sql.= ", t.sellby";
+		$sql.= ", t.eatby";
+		$sql.= ", t.batch";
+		$sql.= ", t.qty";
+		$sql.= ", t.fk_origin_stock";
+		$sql.= ", ps.fk_entrepot";
+		$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element." t";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch pb ON t.fk_origin_stock = pb.rowid";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock ps ON pb.fk_product_stock = ps.rowid";
+		$sql.= " WHERE t.fk_expeditiondet=".(int) $id_line_expdet;
 
 		dol_syslog(__METHOD__ ."", LOG_DEBUG);
 		$resql=$db->query($sql);
@@ -207,6 +210,7 @@ class ExpeditionLineBatch extends CommonObject
 				$tmp->fk_origin_stock = $obj->fk_origin_stock;
 				$tmp->fk_expeditiondet = $obj->fk_expeditiondet;
 				$tmp->dluo_qty = $obj->qty;
+				$tmp->entrepot_id = $obj->fk_entrepot;
 
 				$ret[]=$tmp;
 				$i++;

From fe2acb2cb6a31e1b9e0a9ecf1adb18879745dfcf Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Mon, 23 Oct 2017 22:17:24 +0200
Subject: [PATCH 09/86] Add form select for lot numbers

---
 .../product/class/html.formproduct.class.php  | 124 +++++++++++++++++-
 1 file changed, 123 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 8d4ddc4705d..96a7d35f62b 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -34,6 +34,7 @@ class FormProduct
 
 	// Cache arrays
 	var $cache_warehouses=array();
+	var $cache_lot=array();
 
 
 	/**
@@ -329,5 +330,126 @@ class FormProduct
 		return $return;
 	}
 
-}
+	/**
+	 *  Return list of lot numbers (stock from product_batch) with stock location and stock qty
+	 *
+	 *  @param	int		$selected		Id of preselected lot stock id ('' for no value, 'ifone'=select value if one value otherwise no value)
+	 *  @param  string	$htmlname		Name of html select html
+	 *  @param  string	$filterstatus	lot status filter, following comma separated filter options can be used
+	 *  @param  int		$empty			1=Can be empty, 0 if not
+	 * 	@param	int		$disabled		1=Select is disabled
+	 * 	@param	int		$fk_product		show lot numbers of product with id fk_product. All if 0.
+	 * 	@param	int		$fk_entrepot	show lot numbers in warehouse with id fk_entrepot. All if 0.
+	 *  @param	string	$empty_label	Empty label if needed (only if $empty=1)
+	 *  @param	int		$forcecombo		1=Force combo iso ajax select2
+	 *  @param	array	$events			Events to add to select2
+	 *  @param  string  $morecss		Add more css classes to HTML select
+	 *
+	 * 	@return	string					HTML select
+	 */
+	function selectLotStock($selected='',$htmlname='batch_id',$filterstatus='',$empty=0,$disabled=0,$fk_product=0,$fk_entrepot=0,$empty_label='', $forcecombo=0, $events=array(), $morecss='minwidth200')
+	{
+		global $langs;
 
+		dol_syslog(get_class($this)."::selectLot $selected, $htmlname, $filterstatus, $empty, $disabled, $fk_product, $fk_entrepot, $empty_label, $showstock, $forcecombo, $morecss",LOG_DEBUG);
+
+		$out='';
+
+		$nboflot = $this->loadLotStock($fk_product, $fk_entrepot);
+
+		if ($conf->use_javascript_ajax && ! $forcecombo)
+		{
+			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+			$comboenhancement = ajax_combobox($htmlname, $events);
+			$out.= $comboenhancement;
+		}
+
+		$out.='<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled':'').' id="'.$htmlname.'" name="'.($htmlname.($disabled?'_disabled':'')).'">';
+		if ($empty) $out.='<option value="-1">'.($empty_label?$empty_label:'&nbsp;').'</option>';
+		foreach($this->cache_lot as $id => $arraytypes)
+		{
+			$out.='<option value="'.$id.'"';
+			if ($selected == $id || ($selected == 'ifone' && $nboflot == 1)) $out.=' selected';
+			$out.='>';
+			$out.=$arraytypes['entrepot_label'].' - ';
+			$out.=$arraytypes['batch'];
+			$out.=' ('.$langs->trans("Stock").':'.$arraytypes['qty'].')';
+			$out.='</option>';
+		}
+		$out.='</select>';
+		if ($disabled) $out.='<input type="hidden" name="'.$htmlname.'" value="'.(($selected>0)?$selected:'').'">';
+
+		return $out;
+	}
+
+	/**
+	 * Load in cache array list of lot available in stock
+	 * If fk_product is not 0, we do not use cache
+	 *
+	 * @param	int		$fk_product		    load lot of id fk_product, all if 0. 
+	 * @param	string	$fk_entrepot	    load lot in fk_entrepot all if 0.
+	 *
+	 * @return  int  		    		    Nb of loaded lines, 0 if already loaded, <0 if KO
+	 */
+	function loadLotStock($fk_product = 0, $fk_entrepot = 0)
+	{
+		global $conf, $langs;
+
+		if (empty($fk_product) && empty($fk_product) && count($this->cache_lot))
+		{
+			return count($this->cache_lot); // Cache already loaded and we do not want a list with information specific to a product or warehouse
+		}
+		else 
+		{
+			// clear cache;
+			$this->cache_lot = array();
+		}
+
+		$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.label";
+		$sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.rowid = pb.fk_product_stock";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (".getEntity('stock').")";
+		if (!empty($fk_product) || !empty($fk_entrepot))
+		{
+			$sql.= " WHERE";
+			if (!empty($fk_product))
+			{
+				$sql.= " ps.fk_product = '".$fk_product."'";
+				if (!empty($fk_entrepot))
+				{
+					$sql.= " AND";
+				}
+			}
+			if (!empty($fk_entrepot))
+			{
+				$sql.= " ps.fk_entrepot = '".$fk_entrepot."'";
+			}
+		}
+		$sql.= " ORDER BY e.label, pb.batch";
+
+		dol_syslog(get_class($this).'::loadLotStock', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$this->cache_lot[$obj->rowid]['id'] =$obj->rowid;
+				$this->cache_lot[$obj->rowid]['batch']=$obj->batch;
+				$this->cache_lot[$obj->rowid]['entrepot_id']=$obj->fk_entrepot;
+				$this->cache_lot[$obj->rowid]['entrepot_label']=$obj->label;
+				$this->cache_lot[$obj->rowid]['qty'] = $obj->qty;
+				$i++;
+			}
+
+			return $num;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+}
\ No newline at end of file

From b2cd2290e1cf0d3fb844bae97694dd6ca5c62900 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Mon, 23 Oct 2017 22:18:15 +0200
Subject: [PATCH 10/86] Update card for line update

---
 htdocs/expedition/card.php | 452 +++++++++++++++++++++++++++++--------
 1 file changed, 364 insertions(+), 88 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index bc647c31999..e33176bf391 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -46,7 +46,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))  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->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (! empty($conf->productbatch->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.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';
@@ -597,16 +600,184 @@ if (empty($reshook))
 	    }
 	}
 
+	/*
+	 *  delete a line
+	 */
 	elseif ($action == 'deleteline' && ! empty($line_id))
 	{
 		$object->fetch($id);
+		$lines = $object->lines;
 		$line = new ExpeditionLigne($db);
-		$line->id = $line_id;
-		$result = $line->delete($user);
-		if($result >= 0) {
+		
+		$num_prod = count($lines);
+		for ($i = 0 ; $i < $num_prod ; $i++)
+		{
+			if (count($lines[$i]->details_entrepot) > 1) 
+			{
+				// delete multi warehouse lines
+				foreach ($lines[$i]->details_entrepot as $details_entrepot) {
+					$line->id = GETPOST("lineid".$details_entrepot->line_id);
+					if (!error && $line->delete($user) < 0)
+					{
+						$error++;
+					}
+				}
+			}
+			else if ($lines[$i] == $line_id) 
+			{
+				// delete single warehouse line
+				$line->id = $line_id;
+				if (!error && $line->delete($user) < 0)
+				{
+					$error++;
+				}
+			}
+		}
+		
+		if(! $error) {
 			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
 			exit();
 		}
+		else 
+		{
+			setEventMessages($line->error, $line->errors, 'errors');
+		}
+	}
+
+	/*
+	 *  Update a line
+	 */
+	else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('save'))
+	{
+		// Clean parameters
+
+		$qty=0;
+		$entrepot_id = 0;
+		$batch_id = 0;
+		
+		$lines = $object->lines;
+		$num_prod = count($lines);
+		for ($i = 0 ; $i < $num_prod ; $i++)
+		{
+			if ($lines[$i]->id == $line_id) 
+			{
+				// line to update
+				$line = new ExpeditionLigne($db);
+
+				$line->fk_product = $lines[$i]->fk_product;
+				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
+				{
+					// line with lot
+					foreach ($lines[$i]->detail_batch as $detail_batch) 
+					{
+						$lotStock = new Productbatch($db);
+						$batch="batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
+						$qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
+						$batch_id = GETPOST($batch,'int');
+						if (! empty($batch_id))
+						{
+							if ($lotStock->fetch($batch_id) > 0) 
+							{
+								$line->id = $detail_batch->fk_expeditiondet;
+								$line->detail_batch->fk_origin_stock = $batch_id;
+								$line->detail_batch->batch = $lotStock->batch;
+								$line->detail_batch->id = $detail_batch->id;
+								$line->entrepot_id = $lotStock->warehouseid;
+								$line->qty = GETPOST($qty, 'int');
+								if ($line->update($user) < 0) {
+									setEventMessages($line->error, $line->errors, 'errors');
+									$error++;
+								}
+							}
+							else 
+							{
+								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
+								$error++;
+							}
+						}
+					}
+				}
+				else 
+				{
+					// line without lot
+					if ($lines[$i]->entrepot_id > 0)
+					{
+						// single warehouse shipment line
+						$stockLocation="entl".$line_id;
+						$qty = "qtyl".$line_id;
+						$line->id = $line_id;
+						$line->entrepot_id = GETPOST($stockLocation,'int');
+						$line->qty = GETPOST($qty, 'int');
+						if ($line->update($user) < 0) {
+							setEventMessages($line->error, $line->errors, 'errors');
+							$error++;
+						}
+					}
+					else if (count($lines[$i]->details_entrepot) > 1)
+					{
+						// multi warehouse shipment lines
+						foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+						{
+							if (! $error) {
+								$stockLocation="entl".$detail_entrepot->line_id;
+								$qty = "qtyl".$detail_entrepot->line_id;
+								$warehouse = GETPOST($stockLocation,'int');
+								if (!empty ($warehouse))
+								{
+									$line->id = $detail_entrepot->line_id;
+									$line->entrepot_id = $warehouse;
+									$line->qty = GETPOST($qty, 'int');
+									if ($line->update($user) < 0) {
+										setEventMessages($line->error, $line->errors, 'errors');
+										$error++;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// Extrafields Lines
+		$extrafieldsline = new ExtraFields($db);
+		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+		// Unset extrafield POST Data
+		if (is_array($extralabelsline)) {
+			foreach ($extralabelsline as $key => $value) {
+				unset($_POST["options_" . $key]);
+			}
+		}
+
+		if (! $error) {
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				// Define output language
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09'))
+					$newlang = GETPOST('lang_id','aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+					$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+
+				$ret = $object->fetch($object->id); // Reload to get new records
+				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+		else 
+		{
+			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+			exit();
+		}
+	}
+
+	else if ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('cancel','alpha') == $langs->trans('Cancel')) {
+		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
+		exit();
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
@@ -1743,6 +1914,15 @@ else if ($id || $ref)
 		/*
 		 * Lines of products
 		 */
+		if ($action == 'editline')
+		{
+			print '	<form name="updateline" id="updateline" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;lineid=' . $line_id . '" method="POST">
+			<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
+			<input type="hidden" name="action" value="updateline">
+			<input type="hidden" name="mode" value="">
+			<input type="hidden" name="id" value="' . $object->id . '">
+			';
+		}
 		print '<br>';
 
         print '<div class="div-table-responsive-no-min">';
@@ -1754,36 +1934,62 @@ else if ($id || $ref)
 		}
 		print '<td>'.$langs->trans("Products").'</td>';
 		print '<td align="center">'.$langs->trans("QtyOrdered").'</td>';
-		if ($object->statut <= 1)
-		{
-			print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
-		}
-		else
-		{
-			print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
-		}
-
 		if ($origin && $origin_id > 0)
 		{
-            print '<td align="center">'.$langs->trans("QtyInOtherShipments").'</td>';
+			print '<td align="center">'.$langs->trans("QtyInOtherShipments").'</td>';
+		}
+		if ($action == 'editline')
+		{
+			$editColspan = 3;
+			if (empty($conf->stock->enabled)) $editColspan--;
+			if (empty($conf->productbatch->enabled)) $editColspan--;
+			print '<td align="center" colspan="'. $editColspan . '">';
+			if ($object->statut <= 1)
+			{
+				print $langs->trans("QtyToShip").' - ';
+			}
+			else
+			{
+				print $langs->trans("QtyShipped").' - ';
+			}
+			if (! empty($conf->stock->enabled))
+			{
+				print $langs->trans("WarehouseSource").' - ';
+			}
+			if (! empty($conf->productbatch->enabled))
+			{
+				print $langs->trans("Batch");
+			}
+			print '</td>';
+		}
+		else 
+		{
+			if ($object->statut <= 1)
+			{
+				print '<td align="center">'.$langs->trans("QtyToShip").'</td>';
+			}
+			else
+			{
+				print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
+			}
+			if (! empty($conf->stock->enabled))
+			{
+				print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
+			}
+	
+			if (! empty($conf->productbatch->enabled))
+			{
+				print '<td align="left">'.$langs->trans("Batch").'</td>';
+			}
 		}
-
 		print '<td align="center">'.$langs->trans("CalculatedWeight").'</td>';
 		print '<td align="center">'.$langs->trans("CalculatedVolume").'</td>';
 		//print '<td align="center">'.$langs->trans("Size").'</td>';
-
-		if (! empty($conf->stock->enabled))
+		if ($object->statut == 0)
 		{
-			print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
+			print '<td class="linecoledit"></td>';
+			print '<td class="linecoldelete" width="10"></td>';
 		}
-
-		if (! empty($conf->productbatch->enabled))
-		{
-			print '<td align="left">'.$langs->trans("Batch").'</td>';
-		}
-
-		print '<td class="linecoledit"></td>';
-		print '<td class="linecoldelete" width="10"></td>';
 		print "</tr>\n";
 
 		$var=false;
@@ -1907,9 +2113,6 @@ else if ($id || $ref)
 			// Qty ordered
 			print '<td align="center">'.$lines[$i]->qty_asked.'</td>';
 
-			// Qty to ship or shipped
-			print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
-
 			// Qty in other shipments (with shipment and warehouse used)
     		if ($origin && $origin_id > 0)
     		{
@@ -1941,6 +2144,111 @@ else if ($id || $ref)
     		}
 			print '</td>';
 
+			if ($action == 'editline' && $lines[$i]->id == $line_id)
+			{
+				// edit mode
+				print '<td colspan="'.$editColspan.'"><table>';
+				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
+				{
+					foreach ($lines[$i]->detail_batch as $detail_batch) 
+					{
+						print '<tr>';
+						// Qty to ship or shipped
+						print '<td>' . '<input name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->dluo_qty.'">' . '</td>';
+						// Batch number managment
+						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, 0, '', 0). '</td>';
+						print '</tr>';
+					}
+				} 
+				else if (! empty($conf->stock->enabled))
+				{
+					if ($lines[$i]->entrepot_id > 0)
+					{
+						print '<tr>';
+						// Qty to ship or shipped
+						print '<td>' . '<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">' . '</td>';
+						// Warehouse source
+						print '<td>' . $formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1). '</td>';
+						// Batch number managment
+						print '<td> - ' . $langs->trans("NA") . '</td>';
+						print '</tr>';
+					}
+					else if (count($lines[$i]->details_entrepot) > 1)
+					{
+						foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+						{
+							print '<tr>';
+							// Qty to ship or shipped
+							print '<td>' . '<input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">' . '</td>';
+							// Warehouse source
+							print '<td>' . $formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1) . '</td>';
+							// Batch number managment
+							print '<td> - ' . $langs->trans("NA") . '</td>';
+							print '</tr>';
+						}
+					}
+				}
+				print '</table></td>';
+			}
+			else
+			{
+				// Qty to ship or shipped
+				print '<td align="center">'.$lines[$i]->qty_shipped.'</td>';
+
+				// Warehouse source
+				if (! empty($conf->stock->enabled))
+				{
+					print '<td align="left">';
+					if ($lines[$i]->entrepot_id > 0)
+					{
+						$entrepot = new Entrepot($db);
+						$entrepot->fetch($lines[$i]->entrepot_id);
+						print $entrepot->getNomUrl(1);
+					}
+					else if (count($lines[$i]->details_entrepot) > 1)
+					{
+						$detail = '';
+						foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+						{
+							if ($detail_entrepot->entrepot_id > 0)
+							{
+								$entrepot = new Entrepot($db);
+								$entrepot->fetch($detail_entrepot->entrepot_id);
+								$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
+								print '<input name="lineid'.$detail_entrepot->line_id.'" id="lineid'.$detail_entrepot->line_id.'" type="hidden" value="'.$detail_entrepot->line_id.'">';
+							}
+						}
+						print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail);
+					}
+					print '</td>';
+				}
+
+				// Batch number managment
+				if (! empty($conf->productbatch->enabled))
+				{
+					if (isset($lines[$i]->detail_batch))
+					{
+						print '<td>';
+						if ($lines[$i]->product_tobatch)
+						{
+							$detail = '';
+							foreach ($lines[$i]->detail_batch as $dbatch)
+							{
+								$detail.= $langs->trans("DetailBatchFormat",$dbatch->batch,dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->dluo_qty).'<br/>';
+							}
+							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
+						}
+						else
+						{
+							print $langs->trans("NA");
+						}
+						print '</td>';
+					} else {
+						print '<td></td>';
+					}
+				}
+			}
+
 			// Weight
 			print '<td align="center">';
 			if ($lines[$i]->fk_product_type == 0) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units,"weight");
@@ -1956,69 +2264,30 @@ else if ($id || $ref)
 			// Size
 			//print '<td align="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units,"volume").'</td>';
 
-			// Warehouse source
-			if (! empty($conf->stock->enabled))
+			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
-				print '<td align="left">';
-				if ($lines[$i]->entrepot_id > 0)
-				{
-					$entrepot = new Entrepot($db);
-					$entrepot->fetch($lines[$i]->entrepot_id);
-					print $entrepot->getNomUrl(1);
-				}
-				else if (count($lines[$i]->details_entrepot) > 1)
-				{
-					$detail = '';
-					foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-					{
-						if ($detail_entrepot->entrepot_id > 0)
-						{
-							$entrepot = new Entrepot($db);
-							$entrepot->fetch($detail_entrepot->entrepot_id);
-							$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
-						}
-					}
-					print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail);
-				}
+				print '<td align="center" colspan="2" valign="middle">';
+				print '<input type="submit" class="button" id="savelinebutton" name="save" value="' . $langs->trans("Save") . '"><br>';
+				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="' . $langs->trans("Cancel") . '"><br>';
+			}
+			else if ($object->statut == 0)
+			{
+				// edit-delete buttons
+				print '<td class="linecoledit" align="center">';
+				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">' . img_edit() . '</a>';
+				print '</td>';
+				print '<td class="linecoldelete" width="10">';
+				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">' . img_delete() . '</a>';
 				print '</td>';
-			}
 
-			// Batch number managment
-			if (! empty($conf->productbatch->enabled))
-			{
-				if (isset($lines[$i]->detail_batch))
+				// Display lines extrafields
+				if (! empty($rowExtrafieldsStart))
 				{
-					print '<td>';
-					if ($lines[$i]->product_tobatch)
-					{
-						$detail = '';
-						foreach ($lines[$i]->detail_batch as $dbatch)
-						{
-							$detail.= $langs->trans("DetailBatchFormat",$dbatch->batch,dol_print_date($dbatch->eatby,"day"),dol_print_date($dbatch->sellby,"day"),$dbatch->dluo_qty).'<br/>';
-						}
-						print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
-					}
-					else
-					{
-						print $langs->trans("NA");
-					}
-					print '</td>';
-				} else {
-					print '<td></td>';
+					print $rowExtrafieldsStart;
+					print $rowExtrafieldsView;
+					print $rowEnd;
 				}
 			}
-
-			// edit-delete buttons
-			print '<td class="linecoledit" align="center">';
-			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $lines[$i]->id . '">';
-			print img_edit();
-			print '</a>';
-			print '</td>';
-			print '<td class="linecoldelete" width="10">';
-			print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=deleteline&amp;lineid=' . $lines[$i]->id . '">';
-			print img_delete();
-			print '</a>';
-			print '</td>';
 			print "</tr>";
 
 			// Display lines extrafields
@@ -2027,7 +2296,14 @@ else if ($id || $ref)
 				$line = new ExpeditionLigne($db);
 				$line->fetch_optionals($lines[$i]->id,$extralabelslines);
 				print '<tr class="oddeven">';
-				print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+				if ($lines[$i]->id == $line_id)
+				{
+					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+				}
+				else 
+				{
+					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
+				}
 				print '</tr>';
 			}
 		}
@@ -2137,7 +2413,7 @@ else if ($id || $ref)
 	 * Documents generated
 	 */
 
-	if ($action != 'presend')
+	if ($action != 'presend' && $action != 'editline')
 	{
         print '<div class="fichecenter"><div class="fichehalfleft">';
 

From ba189277ee88a2272cf76260b61c66406821a56e Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 24 Oct 2017 10:53:11 +0200
Subject: [PATCH 11/86] Fix update extrafield

---
 htdocs/expedition/card.php | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index e33176bf391..caf7d7b79a2 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -621,6 +621,7 @@ if (empty($reshook))
 					{
 						$error++;
 					}
+					unset($_POST["lineid".$details_entrepot->line_id]);
 				}
 			}
 			else if ($lines[$i] == $line_id) 
@@ -631,6 +632,7 @@ if (empty($reshook))
 				{
 					$error++;
 				}
+				unset($_POST["lineid"]);
 			}
 		}
 		
@@ -663,7 +665,16 @@ if (empty($reshook))
 			{
 				// line to update
 				$line = new ExpeditionLigne($db);
-
+				// Extrafields Lines
+				$extrafieldsline = new ExtraFields($db);
+				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+				$line->array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+				// Unset extrafield POST Data
+				if (is_array($extralabelsline)) {
+					foreach ($extralabelsline as $key => $value) {
+						unset($_POST["options_" . $key]);
+					}
+				}
 				$line->fk_product = $lines[$i]->fk_product;
 				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
 				{
@@ -695,6 +706,8 @@ if (empty($reshook))
 								$error++;
 							}
 						}
+						unset($_POST[$batch]);
+						unset($_POST[$qty]);
 					}
 				}
 				else 
@@ -712,6 +725,8 @@ if (empty($reshook))
 							setEventMessages($line->error, $line->errors, 'errors');
 							$error++;
 						}
+						unset($_POST[$stockLocation]);
+						unset($_POST[$qty]);
 					}
 					else if (count($lines[$i]->details_entrepot) > 1)
 					{
@@ -732,6 +747,8 @@ if (empty($reshook))
 										$error++;
 									}
 								}
+								unset($_POST[$stockLocation]);
+								unset($_POST[$qty]);
 							}
 						}
 					}
@@ -739,16 +756,7 @@ if (empty($reshook))
 			}
 		}
 
-		// Extrafields Lines
-		$extrafieldsline = new ExtraFields($db);
-		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-		$array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
-		// Unset extrafield POST Data
-		if (is_array($extralabelsline)) {
-			foreach ($extralabelsline as $key => $value) {
-				unset($_POST["options_" . $key]);
-			}
-		}
+		unset($_POST["lineid"]);
 
 		if (! $error) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -2296,7 +2304,7 @@ else if ($id || $ref)
 				$line = new ExpeditionLigne($db);
 				$line->fetch_optionals($lines[$i]->id,$extralabelslines);
 				print '<tr class="oddeven">';
-				if ($lines[$i]->id == $line_id)
+				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
 					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 				}

From 0c38944daa80ceb838f89346f62c8c13e487dfb2 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 24 Oct 2017 11:37:17 +0200
Subject: [PATCH 12/86] Fix delete multi warehouse line

---
 htdocs/expedition/card.php | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 623fe1f0426..c258f7beef6 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -612,28 +612,30 @@ if (empty($reshook))
 		$num_prod = count($lines);
 		for ($i = 0 ; $i < $num_prod ; $i++)
 		{
-			if (count($lines[$i]->details_entrepot) > 1) 
+			if ($lines[$i]->id == $line_id) 
 			{
-				// delete multi warehouse lines
-				foreach ($lines[$i]->details_entrepot as $details_entrepot) {
-					$line->id = GETPOST("lineid".$details_entrepot->line_id);
-					if (!error && $line->delete($user) < 0)
+				if (count($lines[$i]->details_entrepot) > 1) 
+				{
+					// delete multi warehouse lines
+					foreach ($lines[$i]->details_entrepot as $details_entrepot) {
+						$line->id = $details_entrepot->line_id;
+						if (! $error && $line->delete($user) < 0)
+						{
+							$error++;
+						}
+					}
+				}
+				else 
+				{
+					// delete single warehouse line
+					$line->id = $line_id;
+					if (! $error && $line->delete($user) < 0)
 					{
 						$error++;
 					}
-					unset($_POST["lineid".$details_entrepot->line_id]);
 				}
 			}
-			else if ($lines[$i] == $line_id) 
-			{
-				// delete single warehouse line
-				$line->id = $line_id;
-				if (!error && $line->delete($user) < 0)
-				{
-					$error++;
-				}
-				unset($_POST["lineid"]);
-			}
+			unset($_POST["lineid"]);
 		}
 		
 		if(! $error) {
@@ -2223,7 +2225,6 @@ else if ($id || $ref)
 								$entrepot = new Entrepot($db);
 								$entrepot->fetch($detail_entrepot->entrepot_id);
 								$detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
-								print '<input name="lineid'.$detail_entrepot->line_id.'" id="lineid'.$detail_entrepot->line_id.'" type="hidden" value="'.$detail_entrepot->line_id.'">';
 							}
 						}
 						print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"),$detail);

From 914b8c1c7119e6f527af8cb633573c04c6b0323a Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 24 Oct 2017 11:45:11 +0200
Subject: [PATCH 13/86] cleanup

---
 htdocs/expedition/card.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index c258f7beef6..83898b5bf19 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2013       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2014		Cedric GROSS			<c.gross@kreiz-it.fr>
- * Copyright (C) 2014-2015	Francis Appels			<francis.appels@yahoo.com>
+ * Copyright (C) 2014-2017	Francis Appels			<francis.appels@yahoo.com>
  * Copyright (C) 2015		Claudio Aschieri		<c.aschieri@19.coop>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Yasser Carreón			<yacasia@gmail.com>
@@ -46,10 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))  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->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->productbatch->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
-}
+if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.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';

From eaf3958be7e1b31732614eeb9f478559e6428988 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 24 Oct 2017 15:45:49 +0200
Subject: [PATCH 14/86] Revert "Add entrepot id to expedition batch fetchAll"

This reverts commit 5342785a4973c1e3d35be59704ec77f399876e1f.
---
 .../class/expeditionbatch.class.php           | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index c0a2decd93d..5253156e32a 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -177,18 +177,15 @@ class ExpeditionLineBatch extends CommonObject
 	 */
 	static function fetchAll($db,$id_line_expdet)
 	{
-		$sql="SELECT t.rowid";
-		$sql.= ", t.fk_expeditiondet";
-		$sql.= ", t.sellby";
-		$sql.= ", t.eatby";
-		$sql.= ", t.batch";
-		$sql.= ", t.qty";
-		$sql.= ", t.fk_origin_stock";
-		$sql.= ", ps.fk_entrepot";
-		$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element." t";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch pb ON t.fk_origin_stock = pb.rowid";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock ps ON pb.fk_product_stock = ps.rowid";
-		$sql.= " WHERE t.fk_expeditiondet=".(int) $id_line_expdet;
+		$sql="SELECT rowid,";
+		$sql.= "fk_expeditiondet";
+		$sql.= ", sellby";
+		$sql.= ", eatby";
+		$sql.= ", batch";
+		$sql.= ", qty";
+		$sql.= ", fk_origin_stock";
+		$sql.= " FROM ".MAIN_DB_PREFIX.self::$_table_element;
+		$sql.= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
 
 		dol_syslog(__METHOD__ ."", LOG_DEBUG);
 		$resql=$db->query($sql);
@@ -210,7 +207,6 @@ class ExpeditionLineBatch extends CommonObject
 				$tmp->fk_origin_stock = $obj->fk_origin_stock;
 				$tmp->fk_expeditiondet = $obj->fk_expeditiondet;
 				$tmp->dluo_qty = $obj->qty;
-				$tmp->entrepot_id = $obj->fk_entrepot;
 
 				$ret[]=$tmp;
 				$i++;

From 6bf57962dcd639a15bf1e969bd8c67048dc13582 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 24 Oct 2017 15:48:22 +0200
Subject: [PATCH 15/86] Fix travis

---
 htdocs/expedition/class/expedition.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index afe9a368f27..87581cea1ac 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2438,7 +2438,9 @@ class ExpeditionLigne extends CommonObjectLine
 	
 	/**
 	 *  Update a line in database
-	 *
+	 * 
+	 *	@param		User	$user			User that modify
+	 *	@param		int		$notrigger		1 = disable triggers
 	 *  @return		int					< 0 if KO, > 0 if OK
 	 */
 	function update($user = null, $notrigger = 0)

From eaafe83ae4d55799c6744284f1e63e44d088f73a Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 24 Oct 2017 16:05:41 +0200
Subject: [PATCH 16/86] Only show old batch number and qty

---
 htdocs/expedition/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 6bd275d94d2..37aed77bce6 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1220,7 +1220,7 @@ if ($action == 'create')
 									}
 									else
 									{
-										print $langs->trans("DetailBatchFormat", $dbatch->batch, dol_print_date($dbatch->eatby,"day"), dol_print_date($dbatch->sellby,"day"), $dbatch->qty);
+										print $dbatch->batch.' ('.$dbatch->qty.')';
 									}
 									$quantityToBeDelivered -= $deliverableQty;
 									if ($quantityToBeDelivered < 0)

From ecbc393c96138d1377249ea33f8835c321d31f02 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Tue, 24 Oct 2017 21:14:31 +0200
Subject: [PATCH 17/86] FIX SPEC #7013 : use database type "numeric" to store
 monetary values

---
 .../install/mysql/migration/6.0.0-7.0.0.sql   | 80 +++++++++++++++++++
 .../tables/llx_accounting_bookkeeping.sql     |  8 +-
 .../tables/llx_accounting_bookkeeping_tmp.sql |  8 +-
 htdocs/install/mysql/tables/llx_bank.sql      |  2 +-
 .../install/mysql/tables/llx_blockedlog.sql   |  2 +-
 .../mysql/tables/llx_bordereau_cheque.sql     |  4 +-
 .../install/mysql/tables/llx_budget_lines.sql |  2 +-
 htdocs/install/mysql/tables/llx_c_ecotaxe.sql |  2 +-
 .../mysql/tables/llx_chargesociales.sql       |  2 +-
 htdocs/install/mysql/tables/llx_commande.sql  | 22 ++---
 .../mysql/tables/llx_commande_fournisseur.sql | 20 ++---
 .../tables/llx_commande_fournisseurdet.sql    | 28 +++----
 .../install/mysql/tables/llx_commandedet.sql  | 24 +++---
 htdocs/install/mysql/tables/llx_don.sql       |  2 +-
 htdocs/install/mysql/tables/llx_loan.sql      | 16 ++--
 .../mysql/tables/llx_loan_schedule.sql        |  6 +-
 .../mysql/tables/llx_paiementcharge.sql       |  2 +-
 .../mysql/tables/llx_paiementfourn.sql        |  4 +-
 .../mysql/tables/llx_payment_donation.sql     |  2 +-
 .../tables/llx_payment_expensereport.sql      |  2 +-
 .../install/mysql/tables/llx_payment_loan.sql |  6 +-
 .../mysql/tables/llx_payment_salary.sql       |  4 +-
 .../mysql/tables/llx_prelevement_bons.sql     |  2 +-
 .../llx_prelevement_facture_demande.sql       |  2 +-
 .../mysql/tables/llx_prelevement_lignes.sql   |  2 +-
 htdocs/install/mysql/tables/llx_societe.sql   |  2 +-
 .../install/mysql/tables/llx_subscription.sql |  2 +-
 htdocs/install/mysql/tables/llx_tva.sql       |  2 +-
 28 files changed, 170 insertions(+), 90 deletions(-)

diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index cffa2ccfe0b..aa287e5f610 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -458,3 +458,83 @@ UPDATE llx_accounting_system SET fk_country =140 WHERE pcg_version = 'PCN-LUXEMB
 
 -- May have error due to duplicate keys
 ALTER TABLE llx_resource ADD UNIQUE INDEX uk_resource_ref (ref, entity);
+
+-- SPEC : use database type "numeric" to store monetary values
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN debit numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN credit numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN multicurrency_amount numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN debit numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN credit numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN montant numeric(24,8);
+ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN multicurrency_amount numeric(24,8);
+ALTER TABLE llx_bank MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_bordereau_cheque MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_blockedlog MODIFY COLUMN amounts numeric(24,8);
+ALTER TABLE llx_budget_lines MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_chargessociales MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN amount_ht numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN tva numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN localtax1 numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN localtax2 numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN total_ht numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN total_ttc numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN multicurrency_tx numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN multicurrency_total_ht numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN multicurrency_total_tva numeric(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN multicurrency_total_ttc numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN subprice numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN total_ht numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN total_tva numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN total_localtax1 numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN total_localtax2 numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN total_ttc numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN buy_price_ht numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_subprice numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_total_ht numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_total_tva numeric(24,8);
+ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_total_ttc numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN tva numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN localtax1 numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN localtax2 numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN amount_ht numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN total_ht numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN total_ttc numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_total_ht numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_total_tva numeric(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_total_ttc numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax1_tx numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax2_tx numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN subprice numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_ht numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_tva numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_localtax1 numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_localtax2 numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_ttc numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_subprice numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_total_ht numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_total_tva numeric(24,8);
+ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_total_ttc numeric(24,8);
+ALTER TABLE llx_c_ecotaxe MODIFY COLUMN price numeric(24,8);
+ALTER TABLE llx_don MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_loan MODIFY COLUMN capital numeric(24,8);
+ALTER TABLE llx_loan MODIFY COLUMN capital_position numeric(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_capital numeric(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_insurance numeric(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_interest numeric(24,8);
+ALTER TABLE llx_paiementcharge MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_paiementfourn MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_paiementfourn MODIFY COLUMN multicurrency_amount numeric(24,8);
+ALTER TABLE llx_payment_donation MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_payment_expensereport MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_capital numeric(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_insurance numeric(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_interest numeric(24,8);
+ALTER TABLE llx_payment_salary MODIFY COLUMN salary numeric(24,8);
+ALTER TABLE llx_payment_salary MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_prelevement_bons MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_prelevement_lignes MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_societe MODIFY COLUMN capital numeric(24,8);
+ALTER TABLE llx_tva MODIFY COLUMN amount numeric(24,8);
+ALTER TABLE llx_subscription MODIFY COLUMN subscription numeric(24,8);
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index 4d9f6320566..628f14fb5b0 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -32,11 +32,11 @@ CREATE TABLE llx_accounting_bookkeeping
   numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
-  debit                 double(24,8) NOT NULL,		-- FEC:Debit
-  credit                double(24,8) NOT NULL,		-- FEC:Credit
-  montant               double(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
+  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
+  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
+  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
   sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
-  multicurrency_amount  double(24,8),				-- FEC:Montantdevise
+  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
   multicurrency_code    varchar(255),				-- FEC:Idevise
   lettering_code        varchar(255),				-- FEC:EcritureLet
   date_lettering        datetime,					-- FEC:DateLet
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
index e49c937d6ed..8688b97fe9d 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
@@ -32,11 +32,11 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
   numero_compte         varchar(32),		        -- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
-  debit                 double(24,8) NOT NULL,		-- FEC:Debit
-  credit                double(24,8) NOT NULL,		-- FEC:Credit
-  montant               double(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
+  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
+  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
+  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
   sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
-  multicurrency_amount  double(24,8),				-- FEC:Montantdevise
+  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
   multicurrency_code    varchar(255),				-- FEC:Idevise
   lettering_code        varchar(255),				-- FEC:EcritureLet
   date_lettering        datetime,					-- FEC:DateLet
diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql
index 6c2c8d34537..9eee185f1da 100644
--- a/htdocs/install/mysql/tables/llx_bank.sql
+++ b/htdocs/install/mysql/tables/llx_bank.sql
@@ -24,7 +24,7 @@ create table llx_bank
   tms             timestamp,
   datev           date,                      -- date de valeur
   dateo           date,                      -- date operation
-  amount          double(24,8) NOT NULL default 0,
+  amount          numeric(24,8) NOT NULL default 0,
   label           varchar(255),
   fk_account      integer,
   fk_user_author  integer,
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index 2e2710c300c..596dba9e69d 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_blockedlog
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	tms	timestamp,
 	action varchar(50), 
-	amounts real NOT NULL, 
+	amounts numeric(24,8) NOT NULL, 
 	signature varchar(100) NOT NULL, 
 	signature_line varchar(100) NOT NULL, 
 	element varchar(50), 
diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
index 7950d205bc8..4afaee64aaf 100644
--- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
+++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
@@ -25,10 +25,10 @@ create table llx_bordereau_cheque
 (
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
   ref               varchar(30) NOT NULL,					-- ref
-  ref_ext	          varchar(255),							-- ref_ext
+  ref_ext           varchar(255),							-- ref_ext
   datec             datetime NOT NULL,
   date_bordereau    date,
-  amount            double(24,8) NOT NULL,
+  amount            numeric(24,8) NOT NULL,
   nbcheque          smallint NOT NULL,
   fk_bank_account   integer,
   fk_user_author    integer,
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
index c93a6e736e7..74c228ed98c 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -21,7 +21,7 @@ create table llx_budget_lines
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_budget     	integer NOT NULL,
   fk_project_ids	varchar(255) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects.
-  amount			double(24,8) NOT NULL,
+  amount			numeric(24,8) NOT NULL,
   datec        		datetime,
   tms           	timestamp,
   fk_user_creat 	integer,
diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql
index 09613787f76..bee5ab61026 100644
--- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql
+++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql
@@ -22,7 +22,7 @@ create table llx_c_ecotaxe
   rowid        integer      AUTO_INCREMENT PRIMARY KEY,
   code         varchar(64)  NOT NULL,  		-- Code servant a la traduction et a la reference interne
   libelle      varchar(255),                -- Description
-  price        double(24,8),                -- Montant HT
+  price        numeric(24,8),                -- Montant HT
   organization varchar(255),                -- Organisme gerant le bareme tarifaire
   fk_pays      integer NOT NULL,            -- Pays correspondant
   active       tinyint DEFAULT 1  NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index f52d155ecaa..a5b074b83cf 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -34,7 +34,7 @@ create table llx_chargesociales
   fk_type			integer NOT NULL,
   fk_account		integer,                       -- bank account
   fk_mode_reglement	integer,                -- mode de reglement
-  amount			real     default 0 NOT NULL,
+  amount			numeric(24,8) default 0 NOT NULL,
   paye				smallint default 0 NOT NULL,
   periode			date,
   fk_projet			integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index b6708de3783..add3f2d53e2 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -42,15 +42,15 @@ create table llx_commande
   fk_user_cloture		integer,						-- user closing
   source				smallint,						-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
-  amount_ht				real      default 0,
+  amount_ht				numeric(24,8) default 0,
   remise_percent		real      default 0,
   remise_absolue		real      default 0,
   remise				real      default 0,
-  tva					double(24,8)      default 0,
-  localtax1				double(24,8)      default 0,	-- total localtax1 
-  localtax2				double(24,8)      default 0,	-- total localtax2
-  total_ht				double(24,8)      default 0,
-  total_ttc				double(24,8)      default 0,
+  tva					numeric(24,8)     default 0,
+  localtax1				numeric(24,8)     default 0,	-- total localtax1 
+  localtax2				numeric(24,8)     default 0,	-- total localtax2
+  total_ht				numeric(24,8)     default 0,
+  total_ttc				numeric(24,8)     default 0,
   note_private			text,
   note_public			text,
   model_pdf				varchar(255),
@@ -74,9 +74,9 @@ create table llx_commande
   extraparams			varchar(255),					-- for stock other parameters with json format
   
   fk_multicurrency		integer,
-  multicurrency_code			varchar(255),
-  multicurrency_tx			double(24,8) DEFAULT 1,
-  multicurrency_total_ht		double(24,8) DEFAULT 0,
-  multicurrency_total_tva	double(24,8) DEFAULT 0,
-  multicurrency_total_ttc	double(24,8) DEFAULT 0
+  multicurrency_code		varchar(255),
+  multicurrency_tx			numeric(24,8) DEFAULT 1,
+  multicurrency_total_ht	numeric(24,8) DEFAULT 0,
+  multicurrency_total_tva	numeric(24,8) DEFAULT 0,
+  multicurrency_total_ttc	numeric(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index 87124697a57..ec08b95b6fb 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -46,14 +46,14 @@ create table llx_commande_fournisseur
   source				smallint NOT NULL,			-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
   billed				smallint  default 0,
-  amount_ht				real      default 0,
+  amount_ht				numeric(24,8)      default 0,
   remise_percent		real      default 0,
   remise				real      default 0,
-  tva					double(24,8)      default 0,
-  localtax1				double(24,8)      default 0,
-  localtax2				double(24,8)      default 0,
-  total_ht				double(24,8)      default 0,
-  total_ttc				double(24,8)      default 0,
+  tva					numeric(24,8)      default 0,
+  localtax1				numeric(24,8)      default 0,
+  localtax2				numeric(24,8)      default 0,
+  total_ht				numeric(24,8)      default 0,
+  total_ttc				numeric(24,8)      default 0,
   note_private			text,
   note_public			text,
   model_pdf				varchar(255),
@@ -70,9 +70,9 @@ create table llx_commande_fournisseur
   extraparams			varchar(255),					-- for stock other parameters with json format
 
   fk_multicurrency			integer,
-  multicurrency_code			varchar(255),
+  multicurrency_code		varchar(255),
   multicurrency_tx			double(24,8) DEFAULT 1,
-  multicurrency_total_ht		double(24,8) DEFAULT 0,
-  multicurrency_total_tva	double(24,8) DEFAULT 0,
-  multicurrency_total_ttc	double(24,8) DEFAULT 0
+  multicurrency_total_ht	numeric(24,8) DEFAULT 0,
+  multicurrency_total_tva	numeric(24,8) DEFAULT 0,
+  multicurrency_total_ttc	numeric(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
index 85cdcbb9a60..17d86d2b016 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
@@ -30,19 +30,19 @@ create table llx_commande_fournisseurdet
   description                text,
   vat_src_code				 varchar(10)  DEFAULT '',	-- Vat code used as source of vat fields. Not strict foreign key here.
   tva_tx                     double(6,3)  DEFAULT 0,    -- taux tva
-  localtax1_tx               double(6,3)  DEFAULT 0,    -- localtax1 rate
+  localtax1_tx               numeric(24,8) DEFAULT 0,    -- localtax1 rate
   localtax1_type			 varchar(10)	  NULL, 		-- localtax1 type
-  localtax2_tx               double(6,3)  DEFAULT 0,    -- localtax2 rate
+  localtax2_tx               numeric(24,8) DEFAULT 0,    -- localtax2 rate
   localtax2_type			 varchar(10)	  NULL, 		-- localtax2 type
   qty                        real,                      -- quantity
   remise_percent             real         DEFAULT 0,    -- pourcentage de remise
   remise                     real         DEFAULT 0,    -- montant de la remise
-  subprice                   double(24,8) DEFAULT 0,    -- prix unitaire
-  total_ht                   double(24,8) DEFAULT 0,    -- Total HT de la ligne toute quantite et incluant remise ligne et globale
-  total_tva                  double(24,8) DEFAULT 0,	  -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
-  total_localtax1            double(24,8) DEFAULT 0,    -- Total Local Tax 1
-  total_localtax2            double(24,8) DEFAULT 0,    -- Total Local Tax 2
-  total_ttc                  double(24,8) DEFAULT 0,	  -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
+  subprice                   numeric(24,8) DEFAULT 0,    -- prix unitaire
+  total_ht                   numeric(24,8) DEFAULT 0,    -- Total HT de la ligne toute quantite et incluant remise ligne et globale
+  total_tva                  numeric(24,8) DEFAULT 0,	  -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
+  total_localtax1            numeric(24,8) DEFAULT 0,    -- Total Local Tax 1
+  total_localtax2            numeric(24,8) DEFAULT 0,    -- Total Local Tax 2
+  total_ttc                  numeric(24,8) DEFAULT 0,	  -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
   product_type		         integer      DEFAULT 0,
   date_start                 datetime     DEFAULT NULL,       -- date debut si service
   date_end                   datetime     DEFAULT NULL,       -- date fin si service
@@ -52,10 +52,10 @@ create table llx_commande_fournisseurdet
   import_key				 varchar(14),
   fk_unit         integer    DEFAULT NULL,
   
-  fk_multicurrency		integer,
-  multicurrency_code			varchar(255),
-  multicurrency_subprice		double(24,8) DEFAULT 0,
-  multicurrency_total_ht		double(24,8) DEFAULT 0,
-  multicurrency_total_tva	double(24,8) DEFAULT 0,
-  multicurrency_total_ttc	double(24,8) DEFAULT 0
+  fk_multicurrency			integer,
+  multicurrency_code		varchar(255),
+  multicurrency_subprice	numeric(24,8) DEFAULT 0,
+  multicurrency_total_ht	numeric(24,8) DEFAULT 0,
+  multicurrency_total_tva	numeric(24,8) DEFAULT 0,
+  multicurrency_total_ttc	numeric(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql
index 53a1b07c3c7..ae252870fd3 100644
--- a/htdocs/install/mysql/tables/llx_commandedet.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet.sql
@@ -39,18 +39,18 @@ create table llx_commandedet
   remise						real         DEFAULT 0,          -- montant de la remise
   fk_remise_except				integer      NULL,               -- Lien vers table des remises fixes
   price							real,                            -- prix final
-  subprice						double(24,8) DEFAULT 0,          -- P.U. HT (exemple 100)
-  total_ht						double(24,8) DEFAULT 0,          -- Total HT de la ligne toute quantite et incluant remise ligne et globale
-  total_tva						double(24,8) DEFAULT 0,          -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
-  total_localtax1				double(24,8) DEFAULT 0,          -- Total LocalTax1 
-  total_localtax2				double(24,8) DEFAULT 0,          -- Total LocalTax2
-  total_ttc						double(24,8) DEFAULT 0,          -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
+  subprice						numeric(24,8) DEFAULT 0,         -- P.U. HT (exemple 100)
+  total_ht						numeric(24,8) DEFAULT 0,         -- Total HT de la ligne toute quantite et incluant remise ligne et globale
+  total_tva						numeric(24,8) DEFAULT 0,         -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
+  total_localtax1				numeric(24,8) DEFAULT 0,         -- Total LocalTax1 
+  total_localtax2				numeric(24,8) DEFAULT 0,         -- Total LocalTax2
+  total_ttc						numeric(24,8) DEFAULT 0,         -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
   product_type					integer      DEFAULT 0,
   date_start					datetime     DEFAULT NULL,       -- date debut si service
   date_end						datetime     DEFAULT NULL,       -- date fin si service
   info_bits						integer      DEFAULT 0,          -- TVA NPR ou non
 
-  buy_price_ht					double(24,8) DEFAULT 0,          -- buying price
+  buy_price_ht					numeric(24,8) DEFAULT 0,         -- buying price
   fk_product_fournisseur_price	integer      DEFAULT NULL,       -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
   
   special_code					integer      DEFAULT 0,      -- code pour les lignes speciales
@@ -60,12 +60,12 @@ create table llx_commandedet
   
   fk_commandefourndet			integer DEFAULT NULL,       -- link to detail line of commande fourn (resplenish)
   
-  fk_multicurrency		integer,
+  fk_multicurrency				integer,
   multicurrency_code			varchar(255),
-  multicurrency_subprice		double(24,8) DEFAULT 0,
-  multicurrency_total_ht		double(24,8) DEFAULT 0,
-  multicurrency_total_tva	double(24,8) DEFAULT 0,
-  multicurrency_total_ttc	double(24,8) DEFAULT 0
+  multicurrency_subprice		numeric(24,8) DEFAULT 0,
+  multicurrency_total_ht		numeric(24,8) DEFAULT 0,
+  multicurrency_total_tva		numeric(24,8) DEFAULT 0,
+  multicurrency_total_ttc		numeric(24,8) DEFAULT 0
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index e2fbdba9efb..efa6614796c 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -28,7 +28,7 @@ create table llx_don
   tms             timestamp,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
-  amount          real DEFAULT 0,
+  amount          numeric(24,8) DEFAULT 0,
   fk_payment      integer,
   paid            smallint default 0 NOT NULL,
   firstname       varchar(50),
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index f55b793e5ec..ae2d3bac96d 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -23,24 +23,24 @@ create table llx_loan
   entity						integer DEFAULT 1 NOT NULL,
   datec							datetime,
   tms							timestamp,
-  
+
   label							varchar(80) NOT NULL,
   fk_bank						integer,
-  
-  capital						real     default 0 NOT NULL,
+
+  capital						numeric(24,8) default 0 NOT NULL,
   datestart						date,
   dateend						date,
   nbterm						real,
   rate							double  NOT NULL,
-  
+
   note_private                  text,
   note_public                   text,
-  
-  capital_position				real     default 0,		-- If not a new loan, just have the position of capital
+
+  capital_position				numeric(24,8) default 0,		-- If not a new loan, just have the position of capital
   date_position					date,
-  
+
   paid							smallint default 0 NOT NULL,
-  
+
   accountancy_account_capital	varchar(32),
   accountancy_account_insurance	varchar(32),
   accountancy_account_interest	varchar(32),
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
index c682b22f276..eb43238255a 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -24,9 +24,9 @@ create table llx_loan_schedule
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	real DEFAULT 0,
-  amount_insurance	real DEFAULT 0,
-  amount_interest	real DEFAULT 0,
+  amount_capital	numeric(24,8) DEFAULT 0,
+  amount_insurance	numeric(24,8) DEFAULT 0,
+  amount_interest	numeric(24,8) DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
index 2efca933dba..086bafae0fa 100644
--- a/htdocs/install/mysql/tables/llx_paiementcharge.sql
+++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql
@@ -23,7 +23,7 @@ create table llx_paiementcharge
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          real DEFAULT 0,
+  amount          numeric(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
   num_paiement    varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 0e9b1885c97..126d4df8c2a 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -25,8 +25,8 @@ create table llx_paiementfourn
   tms               timestamp,
   datec             datetime,          -- date de creation de l'enregistrement
   datep             datetime,          -- date de paiement
-  amount            real DEFAULT 0,    -- montant
-  multicurrency_amount double(24,8) DEFAULT 0,    -- multicurrency amount
+  amount            numeric(24,8) DEFAULT 0,    -- montant
+  multicurrency_amount numeric(24,8) DEFAULT 0,    -- multicurrency amount
   fk_user_author    integer,           -- auteur
   fk_paiement       integer NOT NULL,  -- moyen de paiement
   num_paiement      varchar(50),       -- numero de paiement (cheque)
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index afa5075cd4e..1859c7aa796 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -23,7 +23,7 @@ create table llx_payment_donation
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          real DEFAULT 0,
+  amount          numeric(24,8) DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 40e39771978..1857246e22e 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -23,7 +23,7 @@ create table llx_payment_expensereport
   datec                   datetime,           -- date de creation
   tms                     timestamp,
   datep                   datetime,           -- payment date
-  amount                  real DEFAULT 0,
+  amount                  numeric(24,8) DEFAULT 0,
   fk_typepayment          integer NOT NULL,
   num_payment             varchar(50),
   note                    text,
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index d023c039391..3b6111a7b2f 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -24,9 +24,9 @@ create table llx_payment_loan
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	real DEFAULT 0,
-  amount_insurance	real DEFAULT 0,
-  amount_interest	real DEFAULT 0,
+  amount_capital	numeric(24,8) DEFAULT 0,
+  amount_insurance	numeric(24,8) DEFAULT 0,
+  amount_interest	numeric(24,8) DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index 38364c6812e..d9b0f3f4477 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -24,8 +24,8 @@ create table llx_payment_salary
   fk_user         integer NOT NULL,
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur (this field should not be here, only into bank tables)
-  salary          real,						  -- salary of user when payment was done
-  amount          real NOT NULL DEFAULT 0,
+  salary          numeric(24,8),			  -- salary of user when payment was done
+  amount          numeric(24,8) NOT NULL DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),				  -- ref
   label           varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
index e92342eb001..c9cdf7992a2 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
@@ -29,7 +29,7 @@ create table llx_prelevement_bons
   ref            varchar(12),        -- reference
   entity         integer DEFAULT 1 NOT NULL, -- multi company id
   datec          datetime,           -- date de creation
-  amount         real DEFAULT 0,     -- montant total du prelevement
+  amount         numeric(24,8) DEFAULT 0, -- montant total du prelevement
   statut         smallint DEFAULT 0, -- statut
   credite        smallint DEFAULT 0, -- indique si le prelevement a ete credite
   note           text,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
index 3bdc0e2ed81..1d1b59bf3f5 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
@@ -21,7 +21,7 @@ create table llx_prelevement_facture_demande
 (
   rowid               integer AUTO_INCREMENT PRIMARY KEY,
   fk_facture          integer NOT NULL,
-  amount              real NOT NULL,
+  amount              numeric(24,8) NOT NULL,
   date_demande        datetime NOT NULL,
   traite              smallint DEFAULT 0,
   date_traite         datetime,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
index 04b6e1ebf5e..448b3846d71 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
@@ -24,7 +24,7 @@ create table llx_prelevement_lignes
   statut              smallint DEFAULT 0,
 
   client_nom          varchar(255),
-  amount              real DEFAULT 0,
+  amount              numeric(24,8) DEFAULT 0,
   code_banque         varchar(128),
   code_guichet        varchar(6),
   number              varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 0f0cb437750..38097090a4c 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -64,7 +64,7 @@ create table llx_societe
   idprof5                  varchar(128),                         		-- IDProf5: nu for france
   idprof6                  varchar(128),                         		-- IDProf6: nu for france
   tva_intra                varchar(20),                         		-- tva
-  capital                  real,                                		-- capital de la societe
+  capital                  numeric(24,8),                       		-- capital de la societe
   fk_stcomm                integer        DEFAULT 0 NOT NULL,      	-- commercial statut
   note_private             text,                                		--
   note_public              text,                                        --
diff --git a/htdocs/install/mysql/tables/llx_subscription.sql b/htdocs/install/mysql/tables/llx_subscription.sql
index 3f54e487060..f1a22d6ec83 100644
--- a/htdocs/install/mysql/tables/llx_subscription.sql
+++ b/htdocs/install/mysql/tables/llx_subscription.sql
@@ -24,7 +24,7 @@ create table llx_subscription
   fk_adherent     integer,
   dateadh         datetime,
   datef           date,
-  subscription    real,
+  subscription    numeric(24,8),
   fk_bank         integer DEFAULT NULL,
   note            text
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index 9abf63d6ad9..c0f680c4824 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -24,7 +24,7 @@ create table llx_tva
   datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
-  amount          real NOT NULL DEFAULT 0,
+  amount          numeric(24,8) NOT NULL DEFAULT 0,
   fk_typepayment  integer NULL,
   num_payment     varchar(50),
   label           varchar(255),

From 78e3c63eade6c0391daccfa7d1d7779f1e07e2d0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Oct 2017 02:26:37 +0200
Subject: [PATCH 18/86] Update card.php

---
 htdocs/expedition/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 37aed77bce6..2dabf0dc3c4 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1218,9 +1218,9 @@ if ($action == 'create')
 										print $langs->trans("Batch").': '.$productlotObject->getNomUrl(1);
 										print ' ('.$dbatch->qty.')';
 									}
-									else
+									else 	// When lot not found in lot table (this can happen with old record)
 									{
-										print $dbatch->batch.' ('.$dbatch->qty.')';
+										print $langs->trans("Batch").': '.$dbatch->batch.' ('.$dbatch->qty.')';
 									}
 									$quantityToBeDelivered -= $deliverableQty;
 									if ($quantityToBeDelivered < 0)

From bc8127d68597d6db1702687f2208260da29ab132 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Fri, 27 Oct 2017 11:52:05 +0200
Subject: [PATCH 19/86] Fix: paid supplier invoices are shown as abandoned on
 the consumption card.

---
 htdocs/societe/consumption.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index c5e9d45c53e..b686c08f579 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2013-2015 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015	   Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2015-2017 Ferran Marcet		<fmarcet@2byte.es>
  *
  * 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
@@ -245,7 +245,7 @@ if ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$documentstatic=new FactureFournisseur($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, ';
+	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
 	$tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
 	$where.= " AND d.fk_facture_fourn = f.rowid";

From 7c1d6251f7acc38c3a7b5b82eacfd8e4eb191467 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 27 Oct 2017 13:27:38 +0200
Subject: [PATCH 20/86] Fix : contract lines from origin were containing all
 lines desc

---
 htdocs/contrat/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 322220c5d4f..2409056cb1f 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -327,7 +327,7 @@ if (empty($reshook))
 										$label = $lines[$i]->product_label;
 									}
 	
-									$desc .= ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
+									$desc = ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?dol_htmlentitiesbr($lines[$i]->desc):'';
 								}
 								else {
 								    $desc = dol_htmlentitiesbr($lines[$i]->desc);

From 92c33b76dc0e0bd5bf0b67e4d45d88d04135686e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 28 Oct 2017 20:35:21 +0200
Subject: [PATCH 21/86] Fix position of search element in quick search

---
 htdocs/core/ajax/selectsearchbox.php | 64 ++++++++++++++--------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 2d92bc8f938..0861ef160b6 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -49,92 +49,92 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 //global $hookmanager;
 $hookmanager->initHooks(array('searchform'));
 
-$search_boxvalue=GETPOST('q');
+$search_boxvalue=GETPOST('q', 'none');
 
 $arrayresult=array();
 
 // Define $searchform
 if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintothirdparty']=array('img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintocontact']=array('img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php?sall='.urlencode($search_boxvalue));
+}
+
+if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
+{
+	$arrayresult['searchintomember']=array('position'=>20, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
 && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
 {
-	$arrayresult['searchintoproduct']=array('img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintoprojects']=array('img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue));
+	$arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue));
 }
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintotasks']=array('img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php?search_all='.urlencode($search_boxvalue));
-}
-
-if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
-{
-	$arrayresult['searchintomember']=array('img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue));
-}
-
-if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
-{
-	$arrayresult['searchintouser']=array('img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/index.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php?search_all='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
 {
-    $arrayresult['searchintopropal']=array('img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php?sall='.urlencode($search_boxvalue));
+    $arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php?sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
 {
-	$arrayresult['searchintoorder']=array('img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php?sall='.urlencode($search_boxvalue));
-}
-if (! empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
-{
-	$arrayresult['searchintoinvoice']=array('img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php?sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
 {
-    $arrayresult['searchintoshipment']=array('img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php?sall='.urlencode($search_boxvalue));
+    $arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php?sall='.urlencode($search_boxvalue));
+}
+if (! empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
+{
+	$arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
 {
-	$arrayresult['searchintosupplierpropal']=array('img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php?sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
 {
-	$arrayresult['searchintosupplierorder']=array('img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode($search_boxvalue));
+	$arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode($search_boxvalue));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
 {
-	$arrayresult['searchintosupplierinvoice']=array('img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
 {
-	$arrayresult['searchintocontract']=array('img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php?sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
 {
-	$arrayresult['searchintointervention']=array('img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php?sall='.urlencode($search_boxvalue));
 }
+
 // HR
+if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
+{
+	$arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/index.php?sall='.urlencode($search_boxvalue));
+}
 if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
 {
-	$arrayresult['searchintoexpensereport']=array('img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
 {
-    $arrayresult['searchintoleaves']=array('img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
+    $arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
 }
 
 
@@ -147,7 +147,7 @@ if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLO
 */
 
 // Execute hook addSearchEntry
-$parameters=array('search_boxvalue'=>$search_boxvalue);
+$parameters=array('search_boxvalue'=>$search_boxvalue, 'arrayresult'=>$arrayresult);
 $reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
 if (empty($reshook))
 {
@@ -155,6 +155,8 @@ if (empty($reshook))
 }
 else $arrayresult=$hookmanager->resArray;
 
+// Sort on position
+$arrayresult = dol_sort_array($arrayresult, 'position');
 
 // Print output if called by ajax or do nothing (var $arrayresult will be used) if called by an include
 if (! isset($usedbyinclude) || empty($usedbyinclude))

From 985a268477bff7479e890a4f709ba1549e32ac43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 28 Oct 2017 22:10:56 +0200
Subject: [PATCH 22/86] Update doc

---
 ChangeLog | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ce7d35884fe..e0a334a9c84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,34 @@ English Dolibarr ChangeLog
 --------------------------------------------------------------
 
 
+***** ChangeLog for 6.0.3 compared to 6.0.2 *****
+
+FIX: #7211 Update qty dispatched on qty change
+FIX: #7458
+FIX: #7593
+FIX: #7616
+FIX: #7619
+FIX: #7626
+FIX: #7648
+FIX: #7675
+FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart
+FIX: API to get object does not return data of linked objects
+FIX: Bad localtax apply
+FIX: Bad ressource list in popup in gantt view
+FIX: bankentries search conciliated if val 0
+FIX: hook formObjectOptions() must use $expe and not $object which i…
+FIX: hook formObjectOptions() must use $expe and not $object which is an order here
+FIX: make of link to other object during creation
+FIX: Missing function getLinesArray
+FIX: old batch not shown in multi shipping
+FIX: paid supplier invoices are shown as abandoned
+FIX: selection of thirdparty was lost on stats page of invoices
+FIX: sql syntax error because of old field accountancy_journal
+FIX: Stats on invoices show nothing
+FIX: substitution in ODT of thirdparties documents
+FIX: wrong key in selectarray
+FIX: wrong personnal project time spent
+
 ***** ChangeLog for 6.0.2 compared to 6.0.1 *****
 
 FIX: #7148

From 7a719c6be6fe5c85d8296e60ad6ccdd6db3f9010 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 29 Oct 2017 05:37:50 +0100
Subject: [PATCH 23/86] NEW General ledger : Add field and selected field

---
 htdocs/accountancy/bookkeeping/list.php       | 220 ++++++++++++------
 .../accountancy/class/bookkeeping.class.php   |  20 +-
 2 files changed, 167 insertions(+), 73 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 30db29db927..ca98431a16e 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@zendsi.com>
+/* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2016 Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2017 Alexandre Spangaro   <aspangaro@zendsi.com>
  * Copyright (C) 2016-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -44,6 +44,8 @@ $search_doc_ref = GETPOST("search_doc_ref");
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 $search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
+$search_date_creation_start = dol_mktime(0, 0, 0, GETPOST('date_creation_startmonth', 'int'), GETPOST('date_creation_startday', 'int'), GETPOST('date_creation_startyear', 'int'));
+$search_date_creation_end = dol_mktime(0, 0, 0, GETPOST('date_creation_endmonth', 'int'), GETPOST('date_creation_endday', 'int'), GETPOST('date_creation_endyear', 'int'));
 
 if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
 	$action = 'delbookkeepingyear';
@@ -102,15 +104,28 @@ if ($action != 'export_file' && ! isset($_POST['begin']) && ! isset($_GET['begin
 	$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
 }
 
-
+$arrayfields=array(
+	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
+	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
+	't.doc_ref'=>array('label'=>$langs->trans("Docref"), 'checked'=>1),
+	't.numero_compte'=>array('label'=>$langs->trans("AccountAccountingShort"), 'checked'=>1),
+	't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
+	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
+	't.crebit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
+	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
+	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
+);
 
 /*
- * Action
+ * Actions
  */
 
 if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
 if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
 
+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
 	$search_mvt_num = '';
@@ -128,6 +143,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_ledger_code = '';
 	$search_date_start = '';
 	$search_date_end = '';
+	$search_date_creation_start = '';
+	$search_date_creation_end = '';
 }
 
 // Must be after the remove filter action, before the export.
@@ -196,6 +213,16 @@ if (! empty($search_mvt_num)) {
 	$filter['t.piece_num'] = $search_mvt_num;
 	$param .= '&search_mvt_num=' . $search_mvt_num;
 }
+if (! empty($search_date_creation_start)) {
+	$filter['t.date_creation>='] = $search_date_creation_start;
+	$tmp=dol_getdate($search_date_creation_start);
+	$param .= '&date_creation_startmonth=' . $tmp['mon'] . '&date_creation_startday=' . $tmp['mday'] . '&date_creation_startyear=' . $tmp['year'];
+}
+if (! empty($search_date_creation_end)) {
+	$filter['t.date_creation<='] = $search_date_creation_end;
+	$tmp=dol_getdate($search_date_end);
+	$param .= '&date_creation_endmonth=' . $tmp['mon'] . '&date_creation_endday=' . $tmp['mday'] . '&date_creation_endyear=' . $tmp['year'];
+}
 
 if ($action == 'delbookkeeping') {
 
@@ -370,85 +397,138 @@ print '<div class="inline-block divButAction"><a class="butActionDelete" name="b
 
 print '</div>';
 
-print '<div class="div-table-responsive">';
-print '<table class="noborder" width="100%">';
+$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste" width="100%">';
+
+// Filters lines
 print '<tr class="liste_titre_filter">';
-print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
-print '<td class="liste_titre center">';
-print '<div class="nowrap">';
-print $langs->trans('From') . ' ';
-print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
-print '</div>';
-print '<div class="nowrap">';
-print $langs->trans('to') . ' ';
-print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
-print '</div>';
-print '</td>';
-print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
-print '<td class="liste_titre">';
-print '<div class="nowrap">';
-print $langs->trans('From').' ';
-print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
-print '</div>';
-print '<div class="nowrap">';
-print $langs->trans('to').' ';
-print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
-print '</div>';
-print '</td>';
-print '<td class="liste_titre">';
-print '<div class="nowrap">';
-print $langs->trans('From').' ';
-// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-// use setup of keypress to select thirdparty and this hang browser on large database.
-if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+// Movement number
+if (! empty($arrayfields['t.piece_num']['checked']))
 {
-	print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
+	print '<td class="liste_titre center">';
 }
-else
+// Date document
+if (! empty($arrayfields['t.doc_date']['checked']))
 {
-	print '<input type="text" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
+	print '<div class="nowrap">';
+	print $langs->trans('From') . ' ';
+	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to') . ' ';
+	print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
+	print '</div>';
+	print '</td>';
 }
-print '</div>';
-print '<div class="nowrap">';
-print $langs->trans('to').' ';
-// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
-// use setup of keypress to select thirdparty and this hang browser on large database.
-if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+// Ref document
+if (! empty($arrayfields['t.doc_ref']['checked']))
 {
-	print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+	print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
 }
-else
+// Accountancy account
+if (! empty($arrayfields['t.numero_compte']['checked']))
 {
-	print '<input type="text" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
+	print '<td class="liste_titre">';
+	print '<div class="nowrap">';
+	print $langs->trans('From').' ';
+	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to').' ';
+	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
+	print '</div>';
+	print '</td>';
+}
+// Subledger account
+if (! empty($arrayfields['t.subledger_account']['checked']))
+{
+	print '<td class="liste_titre">';
+	print '<div class="nowrap">';
+	print $langs->trans('From').' ';
+	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
+	// use setup of keypress to select thirdparty and this hang browser on large database.
+	if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+	{
+		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
+	}
+	else
+	{
+		print '<input type="text" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
+	}
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to').' ';
+	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
+	// use setup of keypress to select thirdparty and this hang browser on large database.
+	if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+	{
+		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
+	}
+	else
+	{
+		print '<input type="text" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
+	}
+	print '</div>';
+	print '</td>';
+}
+// Label operation
+if (! empty($arrayfields['t.label_operation']['checked']))
+{
+	print '<td class="liste_titre">';
+	print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
+	print '</td>';
+}
+// Debit
+if (! empty($arrayfields['t.debit']['checked']))
+{
+	print '<td class="liste_titre center">&nbsp;</td>';
+}
+// Credit
+if (! empty($arrayfields['t.credit']['checked']))
+{
+	print '<td class="liste_titre center">&nbsp;</td>';
+}
+// Code journal
+if (! empty($arrayfields['t.code_journal']['checked']))
+{
+	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
+}
+// Date creation
+if (! empty($arrayfields['t.date_creation']['checked']))
+{
+	print '<div class="nowrap">';
+	print $langs->trans('From') . ' ';
+	print $form->select_date($search_date_creation_start, 'date_creation_start', 0, 0, 1);
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to') . ' ';
+	print $form->select_date($search_date_creation_end, 'date_creation_end', 0, 0, 1);
+	print '</div>';
+	print '</td>';
 }
-print '</div>';
-print '</td>';
-print '<td class="liste_titre">';
-print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
-print '</td>';
-print '<td class="liste_titre center">&nbsp;</td>';
-print '<td class="liste_titre center">&nbsp;</td>';
-print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
 print '<td class="liste_titre center">';
 $searchpicto=$form->showFilterButtons();
 print $searchpicto;
 print '</td>';
-print '</tr>';
+print "</tr>\n";
 
 print '<tr class="liste_titre">';
-print_liste_field_titre("TransactionNumShort", $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre("Docdate", $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre("Docref", $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre("AccountAccountingShort", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre("SubledgerAccount", $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
-print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
-$checkpicto='';
-if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
-print_liste_field_titre($checkpicto, $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['t.piece_num']['checked']))			print_liste_field_titre("TransactionNumShort", $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
+if (! empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre("Docdate", $_SERVER['PHP_SELF'], "t.doc_date", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre("Docref", $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+if (! empty($arrayfields['t.numero_compte']['checked']))		print_liste_field_titre("AccountAccountingShort", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
+if (! empty($arrayfields['t.subledger_account']['checked']))	print_liste_field_titre("SubledgerAccount", $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
+if (! empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+if (! empty($arrayfields['t.debit']['checked']))				print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
+if (! empty($arrayfields['t.credit']['checked']))				print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
+if (! empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['t.date_creation']['checked']))		print_liste_field_titre("DateCreation", $_SERVER['PHP_SELF'], "t.date_creation", "", $param, 'align="center"', $sortfield, $sortorder);
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
 
@@ -478,6 +558,10 @@ while ($i < min($num, $limit))
 	$result = $accountingjournal->fetch('',$line->code_journal);
 	$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
 	print '<td align="center">' . $journaltoshow . '</td>';
+	if (! empty($arrayfields['t.date_creation']['checked']))
+	{
+		print '<td align="center">' . dol_print_date($line->date_creation, 'day') . '</td>';
+	}
 
 	print '<td align="center">';
 	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 2b03f86d2e9..cf35a3d8fff 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -564,7 +564,8 @@ class BookKeeping extends CommonObject
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
-		$sql .= " t.piece_num";
+		$sql .= " t.piece_num,";
+		$sql .= " t.date_creation";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element.$mode. ' as t';
 		$sql .= ' WHERE 1 = 1';
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
@@ -603,6 +604,7 @@ class BookKeeping extends CommonObject
 				$this->code_journal = $obj->code_journal;
 				$this->journal_label = $obj->journal_label;
 				$this->piece_num = $obj->piece_num;
+				$this->date_creation = $this->db->jdate($obj->date_creation);
 			}
 			$this->db->free($resql);
 
@@ -658,7 +660,8 @@ class BookKeeping extends CommonObject
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
-		$sql .= " t.piece_num";
+		$sql .= " t.piece_num,";
+		$sql .= " t.date_creation";
 		// Manage filter
 		$sqlwhere = array ();
 		if (count($filter) > 0) {
@@ -725,6 +728,7 @@ class BookKeeping extends CommonObject
 				$line->code_journal = $obj->code_journal;
 				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
+				$line->date_creation = $obj->date_creation;
 
 				$this->lines[] = $line;
 			}
@@ -777,7 +781,8 @@ class BookKeeping extends CommonObject
 		$sql .= " t.import_key,";
 		$sql .= " t.code_journal,";
 		$sql .= " t.journal_label,";
-		$sql .= " t.piece_num";
+		$sql .= " t.piece_num,";
+		$sql .= " t.date_creation";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		// Manage filter
 		$sqlwhere = array ();
@@ -841,6 +846,7 @@ class BookKeeping extends CommonObject
 				$line->code_journal = $obj->code_journal;
 				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
+				$line->date_creation = $obj->date_creation;
 
 				$this->lines[] = $line;
 			}
@@ -1336,6 +1342,7 @@ class BookKeeping extends CommonObject
 		$this->code_journal = 'VT';
 		$this->journal_label = 'Journal de vente';
 		$this->piece_num = '';
+		$this->date_creation = $now;
 	}
 
 	/**
@@ -1348,7 +1355,7 @@ class BookKeeping extends CommonObject
 	public function fetchPerMvt($piecenum, $mode='') {
 		global $conf;
 
-		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type";
+		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type,date_creation";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
@@ -1364,6 +1371,7 @@ class BookKeeping extends CommonObject
 			$this->doc_date = $this->db->jdate($obj->doc_date);
 			$this->doc_ref = $obj->doc_ref;
 			$this->doc_type = $obj->doc_type;
+			$this->date_creation = $obj->date_creation;
 		} else {
 			$this->error = "Error " . $this->db->lasterror();
 			dol_syslog(get_class($this) . "::" . __METHOD__ . $this->error, LOG_ERR);
@@ -1414,7 +1422,7 @@ class BookKeeping extends CommonObject
 		$sql = "SELECT rowid, doc_date, doc_type,";
 		$sql .= " doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,";
 		$sql .= " numero_compte, label_compte, label_operation, debit, credit,";
-		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num";
+		$sql .= " montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num, date_creation";
 		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element.$mode;
 		$sql .= " WHERE piece_num = " . $piecenum;
 		$sql .= " AND entity IN (" . getEntity('accountancy') . ")";
@@ -1447,6 +1455,7 @@ class BookKeeping extends CommonObject
 				$line->code_journal = $obj->code_journal;
 				$line->journal_label = $obj->journal_label;
 				$line->piece_num = $obj->piece_num;
+				$line->date_creation = $obj->date_creation;
 
 				$this->linesmvt[] = $line;
 			}
@@ -1785,4 +1794,5 @@ class BookKeepingLine
 	public $code_journal;
 	public $journal_label;
 	public $piece_num;
+	public $date_creation;
 }

From 16e4e8ada14442cf4aca9cd48cc6769d170e1642 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 29 Oct 2017 06:56:05 +0100
Subject: [PATCH 24/86] Fix SPEC1

---
 .../install/mysql/migration/6.0.0-7.0.0.sql   | 106 +++++-------------
 .../tables/llx_accounting_bookkeeping.sql     |  10 +-
 .../tables/llx_accounting_bookkeeping_tmp.sql |  10 +-
 htdocs/install/mysql/tables/llx_bank.sql      |   2 +-
 .../install/mysql/tables/llx_blockedlog.sql   |   2 +-
 .../mysql/tables/llx_bordereau_cheque.sql     |   2 +-
 .../install/mysql/tables/llx_budget_lines.sql |   2 +-
 htdocs/install/mysql/tables/llx_c_ecotaxe.sql |   2 +-
 .../mysql/tables/llx_chargesociales.sql       |   2 +-
 htdocs/install/mysql/tables/llx_commande.sql  | 104 ++++++++---------
 .../mysql/tables/llx_commande_fournisseur.sql |  90 +++++++--------
 .../tables/llx_commande_fournisseurdet.sql    |  24 ++--
 .../install/mysql/tables/llx_commandedet.sql  |  30 ++---
 htdocs/install/mysql/tables/llx_don.sql       |   2 +-
 .../mysql/tables/llx_expensereport_rules.sql  |  26 ++---
 htdocs/install/mysql/tables/llx_loan.sql      |   8 +-
 .../mysql/tables/llx_loan_schedule.sql        |   6 +-
 .../mysql/tables/llx_paiementcharge.sql       |   2 +-
 .../mysql/tables/llx_paiementfourn.sql        |  30 ++---
 .../mysql/tables/llx_payment_donation.sql     |   2 +-
 .../tables/llx_payment_expensereport.sql      |   2 +-
 .../install/mysql/tables/llx_payment_loan.sql |  10 +-
 .../mysql/tables/llx_payment_salary.sql       |   4 +-
 .../mysql/tables/llx_prelevement_bons.sql     |   2 +-
 .../llx_prelevement_facture_demande.sql       |   2 +-
 .../mysql/tables/llx_prelevement_lignes.sql   |   2 +-
 htdocs/install/mysql/tables/llx_societe.sql   |   2 +-
 .../install/mysql/tables/llx_subscription.sql |   2 +-
 htdocs/install/mysql/tables/llx_tva.sql       |   2 +-
 29 files changed, 219 insertions(+), 271 deletions(-)

diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index aa287e5f610..a42a3411811 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -459,82 +459,30 @@ UPDATE llx_accounting_system SET fk_country =140 WHERE pcg_version = 'PCN-LUXEMB
 -- May have error due to duplicate keys
 ALTER TABLE llx_resource ADD UNIQUE INDEX uk_resource_ref (ref, entity);
 
--- SPEC : use database type "numeric" to store monetary values
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN debit numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN credit numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN multicurrency_amount numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN debit numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN credit numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN montant numeric(24,8);
-ALTER TABLE llx_accounting_bookkeeping_tmp MODIFY COLUMN multicurrency_amount numeric(24,8);
-ALTER TABLE llx_bank MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_bordereau_cheque MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_blockedlog MODIFY COLUMN amounts numeric(24,8);
-ALTER TABLE llx_budget_lines MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_chargessociales MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN amount_ht numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN tva numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN localtax1 numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN localtax2 numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN total_ht numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN total_ttc numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN multicurrency_tx numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN multicurrency_total_ht numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN multicurrency_total_tva numeric(24,8);
-ALTER TABLE llx_commande MODIFY COLUMN multicurrency_total_ttc numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN subprice numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN total_ht numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN total_tva numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN total_localtax1 numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN total_localtax2 numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN total_ttc numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN buy_price_ht numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_subprice numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_total_ht numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_total_tva numeric(24,8);
-ALTER TABLE llx_commandedet MODIFY COLUMN multicurrency_total_ttc numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN tva numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN localtax1 numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN localtax2 numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN amount_ht numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN total_ht numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN total_ttc numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_total_ht numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_total_tva numeric(24,8);
-ALTER TABLE llx_commande_fournisseur MODIFY COLUMN multicurrency_total_ttc numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax1_tx numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN localtax2_tx numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN subprice numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_ht numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_tva numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_localtax1 numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_localtax2 numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN total_ttc numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_subprice numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_total_ht numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_total_tva numeric(24,8);
-ALTER TABLE llx_commande_fournisseurdet MODIFY COLUMN multicurrency_total_ttc numeric(24,8);
-ALTER TABLE llx_c_ecotaxe MODIFY COLUMN price numeric(24,8);
-ALTER TABLE llx_don MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_loan MODIFY COLUMN capital numeric(24,8);
-ALTER TABLE llx_loan MODIFY COLUMN capital_position numeric(24,8);
-ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_capital numeric(24,8);
-ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_insurance numeric(24,8);
-ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_interest numeric(24,8);
-ALTER TABLE llx_paiementcharge MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_paiementfourn MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_paiementfourn MODIFY COLUMN multicurrency_amount numeric(24,8);
-ALTER TABLE llx_payment_donation MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_payment_expensereport MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_payment_loan MODIFY COLUMN amount_capital numeric(24,8);
-ALTER TABLE llx_payment_loan MODIFY COLUMN amount_insurance numeric(24,8);
-ALTER TABLE llx_payment_loan MODIFY COLUMN amount_interest numeric(24,8);
-ALTER TABLE llx_payment_salary MODIFY COLUMN salary numeric(24,8);
-ALTER TABLE llx_payment_salary MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_prelevement_bons MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_prelevement_lignes MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_societe MODIFY COLUMN capital numeric(24,8);
-ALTER TABLE llx_tva MODIFY COLUMN amount numeric(24,8);
-ALTER TABLE llx_subscription MODIFY COLUMN subscription numeric(24,8);
+-- SPEC : use database type "double" to store monetary values
+ALTER TABLE llx_blockedlog MODIFY COLUMN amounts double(24,8);
+ALTER TABLE llx_chargessociales MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_commande MODIFY COLUMN amount_ht double(24,8);
+ALTER TABLE llx_commande_fournisseur MODIFY COLUMN amount_ht double(24,8);
+ALTER TABLE llx_don MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_expensereport_rules MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_loan MODIFY COLUMN capital double(24,8);
+ALTER TABLE llx_loan MODIFY COLUMN capital_position double(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_capital double(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_insurance double(24,8);
+ALTER TABLE llx_loan_schedule MODIFY COLUMN amount_interest double(24,8);
+ALTER TABLE llx_paiementcharge MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_paiementfourn MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_payment_donation MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_payment_expensereport MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_capital double(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_insurance double(24,8);
+ALTER TABLE llx_payment_loan MODIFY COLUMN amount_interest double(24,8);
+ALTER TABLE llx_payment_salary MODIFY COLUMN salary double(24,8);
+ALTER TABLE llx_payment_salary MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_prelevement_bons MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_prelevement_lignes MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_societe MODIFY COLUMN capital double(24,8);
+ALTER TABLE llx_tva MODIFY COLUMN amount double(24,8);
+ALTER TABLE llx_subscription MODIFY COLUMN subscription double(24,8);
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index 628f14fb5b0..c7f8faa6f63 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -32,15 +32,15 @@ CREATE TABLE llx_accounting_bookkeeping
   numero_compte         varchar(32) NOT NULL,		-- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
-  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
-  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
-  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
+  debit                 double(24,8) NOT NULL,		-- FEC:Debit
+  credit                double(24,8) NOT NULL,		-- FEC:Credit
+  montant               double(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
   sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
-  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
+  multicurrency_amount  double(24,8),				-- FEC:Montantdevise
   multicurrency_code    varchar(255),				-- FEC:Idevise
   lettering_code        varchar(255),				-- FEC:EcritureLet
   date_lettering        datetime,					-- FEC:DateLet
-  date_lim_reglement	datetime DEFAULT NULL,		-- 					| date limite de reglement
+  date_lim_reglement    datetime DEFAULT NULL,		-- 					| date limite de reglement
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
index 8688b97fe9d..3b4a4e54143 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
@@ -32,15 +32,15 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
   numero_compte         varchar(32),		        -- FEC:CompteNum	| account number
   label_compte          varchar(255) NOT NULL,		-- FEC:CompteLib	| label of account
   label_operation       varchar(255),				-- FEC:EcritureLib	| label of the operation
-  debit                 numeric(24,8) NOT NULL,		-- FEC:Debit
-  credit                numeric(24,8) NOT NULL,		-- FEC:Credit
-  montant               numeric(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
+  debit                 double(24,8) NOT NULL,		-- FEC:Debit
+  credit                double(24,8) NOT NULL,		-- FEC:Credit
+  montant               double(24,8) NOT NULL,		-- FEC:Montant (Not necessary)
   sens                  varchar(1) DEFAULT NULL,	-- FEC:Sens (Not necessary)
-  multicurrency_amount  numeric(24,8),				-- FEC:Montantdevise
+  multicurrency_amount  double(24,8),				-- FEC:Montantdevise
   multicurrency_code    varchar(255),				-- FEC:Idevise
   lettering_code        varchar(255),				-- FEC:EcritureLet
   date_lettering        datetime,					-- FEC:DateLet
-  date_lim_reglement	datetime,					-- 					| date limite de reglement
+  date_lim_reglement    datetime,					-- 					| date limite de reglement
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql
index 9eee185f1da..6c2c8d34537 100644
--- a/htdocs/install/mysql/tables/llx_bank.sql
+++ b/htdocs/install/mysql/tables/llx_bank.sql
@@ -24,7 +24,7 @@ create table llx_bank
   tms             timestamp,
   datev           date,                      -- date de valeur
   dateo           date,                      -- date operation
-  amount          numeric(24,8) NOT NULL default 0,
+  amount          double(24,8) NOT NULL default 0,
   label           varchar(255),
   fk_account      integer,
   fk_user_author  integer,
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index 596dba9e69d..d94f2ade702 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_blockedlog
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	tms	timestamp,
 	action varchar(50), 
-	amounts numeric(24,8) NOT NULL, 
+	amounts double(24,8) NOT NULL, 
 	signature varchar(100) NOT NULL, 
 	signature_line varchar(100) NOT NULL, 
 	element varchar(50), 
diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
index 4afaee64aaf..ec400f6cbbd 100644
--- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
+++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
@@ -28,7 +28,7 @@ create table llx_bordereau_cheque
   ref_ext           varchar(255),							-- ref_ext
   datec             datetime NOT NULL,
   date_bordereau    date,
-  amount            numeric(24,8) NOT NULL,
+  amount            double(24,8) NOT NULL,
   nbcheque          smallint NOT NULL,
   fk_bank_account   integer,
   fk_user_author    integer,
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
index 74c228ed98c..c93a6e736e7 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -21,7 +21,7 @@ create table llx_budget_lines
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_budget     	integer NOT NULL,
   fk_project_ids	varchar(255) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects.
-  amount			numeric(24,8) NOT NULL,
+  amount			double(24,8) NOT NULL,
   datec        		datetime,
   tms           	timestamp,
   fk_user_creat 	integer,
diff --git a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql
index bee5ab61026..09613787f76 100644
--- a/htdocs/install/mysql/tables/llx_c_ecotaxe.sql
+++ b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql
@@ -22,7 +22,7 @@ create table llx_c_ecotaxe
   rowid        integer      AUTO_INCREMENT PRIMARY KEY,
   code         varchar(64)  NOT NULL,  		-- Code servant a la traduction et a la reference interne
   libelle      varchar(255),                -- Description
-  price        numeric(24,8),                -- Montant HT
+  price        double(24,8),                -- Montant HT
   organization varchar(255),                -- Organisme gerant le bareme tarifaire
   fk_pays      integer NOT NULL,            -- Pays correspondant
   active       tinyint DEFAULT 1  NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index a5b074b83cf..c32198dd6e6 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -34,7 +34,7 @@ create table llx_chargesociales
   fk_type			integer NOT NULL,
   fk_account		integer,                       -- bank account
   fk_mode_reglement	integer,                -- mode de reglement
-  amount			numeric(24,8) default 0 NOT NULL,
+  amount			double(24,8) default 0 NOT NULL,
   paye				smallint default 0 NOT NULL,
   periode			date,
   fk_projet			integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index add3f2d53e2..0e430c0c483 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -20,63 +20,63 @@
 
 create table llx_commande
 (
-  rowid					integer AUTO_INCREMENT PRIMARY KEY,
-  ref					varchar(30)       NOT NULL,		-- order reference number
-  entity				integer DEFAULT 1 NOT NULL,		-- multi company id
+  rowid						integer AUTO_INCREMENT PRIMARY KEY,
+  ref						varchar(30)       NOT NULL,		-- order reference number
+  entity					integer DEFAULT 1 NOT NULL,		-- multi company id
 
-  ref_ext				varchar(255),					-- reference into an external system (not used by dolibarr)
-  ref_int				varchar(255),					-- reference into an internal system (deprecated)
-  ref_client			varchar(255),					-- reference for customer
+  ref_ext					varchar(255),					-- reference into an external system (not used by dolibarr)
+  ref_int					varchar(255),					-- reference into an internal system (deprecated)
+  ref_client				varchar(255),					-- reference for customer
 
-  fk_soc				integer NOT NULL,
-  fk_projet				integer DEFAULT NULL,			-- projet auquel est rattache la commande
+  fk_soc					integer NOT NULL,
+  fk_projet					integer DEFAULT NULL,			-- projet auquel est rattache la commande
 
-  tms					timestamp,
-  date_creation			datetime,						-- date de creation 
-  date_valid			datetime,						-- date de validation
-  date_cloture			datetime,						-- date de cloture
-  date_commande			date,							-- date de la commande
-  fk_user_author		integer,						-- user making creation
-  fk_user_modif         integer,                       -- user making last change
-  fk_user_valid			integer,						-- user validating
-  fk_user_cloture		integer,						-- user closing
-  source				smallint,						-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
-  fk_statut				smallint  default 0,
-  amount_ht				numeric(24,8) default 0,
-  remise_percent		real      default 0,
-  remise_absolue		real      default 0,
-  remise				real      default 0,
-  tva					numeric(24,8)     default 0,
-  localtax1				numeric(24,8)     default 0,	-- total localtax1 
-  localtax2				numeric(24,8)     default 0,	-- total localtax2
-  total_ht				numeric(24,8)     default 0,
-  total_ttc				numeric(24,8)     default 0,
-  note_private			text,
-  note_public			text,
-  model_pdf				varchar(255),
-  last_main_doc			varchar(255),					-- relative filepath+filename of last main generated document
+  tms						timestamp,
+  date_creation				datetime,						-- date de creation 
+  date_valid				datetime,						-- date de validation
+  date_cloture				datetime,						-- date de cloture
+  date_commande				date,							-- date de la commande
+  fk_user_author			integer,						-- user making creation
+  fk_user_modif				integer,						-- user making last change
+  fk_user_valid				integer,						-- user validating
+  fk_user_cloture			integer,						-- user closing
+  source					smallint,						-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
+  fk_statut					smallint  default 0,
+  amount_ht					double(24,8) default 0,
+  remise_percent			real      default 0,
+  remise_absolue			real      default 0,
+  remise					real      default 0,
+  tva						double(24,8)     default 0,
+  localtax1					double(24,8)     default 0,	-- total localtax1 
+  localtax2					double(24,8)     default 0,	-- total localtax2
+  total_ht					double(24,8)     default 0,
+  total_ttc					double(24,8)     default 0,
+  note_private				text,
+  note_public				text,
+  model_pdf					varchar(255),
+  last_main_doc				varchar(255),					-- relative filepath+filename of last main generated document
 
-  facture				tinyint   default 0,
-  fk_account			integer,						-- bank account
-  fk_currency			varchar(3),						-- currency code
-  fk_cond_reglement		integer,						-- condition de reglement
-  fk_mode_reglement		integer,						-- mode de reglement
+  facture					tinyint   default 0,
+  fk_account				integer,						-- bank account
+  fk_currency				varchar(3),						-- currency code
+  fk_cond_reglement			integer,						-- condition de reglement
+  fk_mode_reglement			integer,						-- mode de reglement
   
-  date_livraison		date 	  default NULL,
-  fk_shipping_method    integer,                       -- shipping method id
-  fk_warehouse		  integer 	  default NULL,
-  fk_availability		integer NULL,
-  fk_input_reason		integer,						-- id coming from c_input_reason, '0' if no defined
-  fk_delivery_address	integer,						-- delivery address (deprecated)
-  fk_incoterms          integer,						-- for incoterms
-  location_incoterms    varchar(255),					-- for incoterms
-  import_key			varchar(14),
-  extraparams			varchar(255),					-- for stock other parameters with json format
+  date_livraison			date 	  default NULL,
+  fk_shipping_method		integer,						-- shipping method id
+  fk_warehouse				integer default NULL,
+  fk_availability			integer NULL,
+  fk_input_reason			integer,						-- id coming from c_input_reason, '0' if no defined
+  fk_delivery_address		integer,						-- delivery address (deprecated)
+  fk_incoterms				integer,						-- for incoterms
+  location_incoterms		varchar(255),					-- for incoterms
+  import_key				varchar(14),
+  extraparams				varchar(255),					-- for stock other parameters with json format
   
-  fk_multicurrency		integer,
+  fk_multicurrency			integer,
   multicurrency_code		varchar(255),
-  multicurrency_tx			numeric(24,8) DEFAULT 1,
-  multicurrency_total_ht	numeric(24,8) DEFAULT 0,
-  multicurrency_total_tva	numeric(24,8) DEFAULT 0,
-  multicurrency_total_ttc	numeric(24,8) DEFAULT 0
+  multicurrency_tx			double(24,8) DEFAULT 1,
+  multicurrency_total_ht	double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index ec08b95b6fb..bb060afca67 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -21,58 +21,58 @@
 
 create table llx_commande_fournisseur
 (
-  rowid					integer AUTO_INCREMENT PRIMARY KEY,
+  rowid						integer AUTO_INCREMENT PRIMARY KEY,
 
-  ref					varchar(255) NOT NULL,          -- order number
-  entity				integer DEFAULT 1 NOT NULL,	 -- multi company id
+  ref						varchar(255) NOT NULL,         -- order number
+  entity					integer DEFAULT 1 NOT NULL,    -- multi company id
 
-  ref_ext				varchar(64),                  -- reference into an external system (not used by dolibarr)
-  ref_supplier			varchar(255),
+  ref_ext					varchar(64),                   -- reference into an external system (not used by dolibarr)
+  ref_supplier				varchar(255),
 
-  fk_soc				integer NOT NULL,
-  fk_projet				integer DEFAULT 0,             -- project id
+  fk_soc					integer NOT NULL,
+  fk_projet					integer DEFAULT 0,             -- project id
 
-  tms					timestamp,
-  date_creation			datetime,                      -- date de creation 
-  date_valid			datetime,                      -- date de validation
-  date_approve			datetime,                      -- date de approve
-  date_approve2			datetime,                      -- date de approve 2 (when double approving is accivated)
-  date_commande			date,                          -- date de la commande
-  fk_user_author		integer,                       -- user making creation
-  fk_user_modif         integer,                       -- user making last change
-  fk_user_valid			integer,                       -- user validating
-  fk_user_approve		integer,                       -- user approving
-  fk_user_approve2		integer,                       -- user approving 2 (when double approving is accivated)
-  source				smallint NOT NULL,			-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
-  fk_statut				smallint  default 0,
-  billed				smallint  default 0,
-  amount_ht				numeric(24,8)      default 0,
-  remise_percent		real      default 0,
-  remise				real      default 0,
-  tva					numeric(24,8)      default 0,
-  localtax1				numeric(24,8)      default 0,
-  localtax2				numeric(24,8)      default 0,
-  total_ht				numeric(24,8)      default 0,
-  total_ttc				numeric(24,8)      default 0,
-  note_private			text,
-  note_public			text,
-  model_pdf				varchar(255),
-  last_main_doc			varchar(255),					-- relative filepath+filename of last main generated document
+  tms						timestamp,
+  date_creation				datetime,                      -- date de creation 
+  date_valid				datetime,                      -- date de validation
+  date_approve				datetime,                      -- date de approve
+  date_approve2				datetime,                      -- date de approve 2 (when double approving is accivated)
+  date_commande				date,                          -- date de la commande
+  fk_user_author			integer,                       -- user making creation
+  fk_user_modif				integer,                       -- user making last change
+  fk_user_valid				integer,                       -- user validating
+  fk_user_approve			integer,                       -- user approving
+  fk_user_approve2			integer,                       -- user approving 2 (when double approving is accivated)
+  source					smallint NOT NULL,             -- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
+  fk_statut					smallint  default 0,
+  billed					smallint  default 0,
+  amount_ht					double(24,8)      default 0,
+  remise_percent			real      default 0,
+  remise					real      default 0,
+  tva						double(24,8)      default 0,
+  localtax1					double(24,8)      default 0,
+  localtax2					double(24,8)      default 0,
+  total_ht					double(24,8)      default 0,
+  total_ttc					double(24,8)      default 0,
+  note_private				text,
+  note_public				text,
+  model_pdf					varchar(255),
+  last_main_doc				varchar(255),					-- relative filepath+filename of last main generated document
 
-  date_livraison		datetime  default NULL,
-  fk_account            integer,                       -- bank account
-  fk_cond_reglement		integer,                       -- condition de reglement
-  fk_mode_reglement		integer,                       -- mode de reglement
-  fk_input_method	    integer default 0,            -- id coming from c_input_reason, '0' if no defined
-  fk_incoterms          integer,						-- for incoterms
-  location_incoterms    varchar(255),					-- for incoterms
-  import_key			varchar(14),
-  extraparams			varchar(255),					-- for stock other parameters with json format
+  date_livraison			datetime default NULL,
+  fk_account				integer,                       -- bank account
+  fk_cond_reglement			integer,                       -- condition de reglement
+  fk_mode_reglement			integer,                       -- mode de reglement
+  fk_input_method			integer default 0,            -- id coming from c_input_reason, '0' if no defined
+  fk_incoterms				integer,						-- for incoterms
+  location_incoterms		varchar(255),					-- for incoterms
+  import_key				varchar(14),
+  extraparams				varchar(255),					-- for stock other parameters with json format
 
   fk_multicurrency			integer,
   multicurrency_code		varchar(255),
   multicurrency_tx			double(24,8) DEFAULT 1,
-  multicurrency_total_ht	numeric(24,8) DEFAULT 0,
-  multicurrency_total_tva	numeric(24,8) DEFAULT 0,
-  multicurrency_total_ttc	numeric(24,8) DEFAULT 0
+  multicurrency_total_ht	double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
index 17d86d2b016..dd9dc40c412 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
@@ -30,19 +30,19 @@ create table llx_commande_fournisseurdet
   description                text,
   vat_src_code				 varchar(10)  DEFAULT '',	-- Vat code used as source of vat fields. Not strict foreign key here.
   tva_tx                     double(6,3)  DEFAULT 0,    -- taux tva
-  localtax1_tx               numeric(24,8) DEFAULT 0,    -- localtax1 rate
+  localtax1_tx               double(24,8) DEFAULT 0,    -- localtax1 rate
   localtax1_type			 varchar(10)	  NULL, 		-- localtax1 type
-  localtax2_tx               numeric(24,8) DEFAULT 0,    -- localtax2 rate
+  localtax2_tx               double(24,8) DEFAULT 0,    -- localtax2 rate
   localtax2_type			 varchar(10)	  NULL, 		-- localtax2 type
   qty                        real,                      -- quantity
   remise_percent             real         DEFAULT 0,    -- pourcentage de remise
   remise                     real         DEFAULT 0,    -- montant de la remise
-  subprice                   numeric(24,8) DEFAULT 0,    -- prix unitaire
-  total_ht                   numeric(24,8) DEFAULT 0,    -- Total HT de la ligne toute quantite et incluant remise ligne et globale
-  total_tva                  numeric(24,8) DEFAULT 0,	  -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
-  total_localtax1            numeric(24,8) DEFAULT 0,    -- Total Local Tax 1
-  total_localtax2            numeric(24,8) DEFAULT 0,    -- Total Local Tax 2
-  total_ttc                  numeric(24,8) DEFAULT 0,	  -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
+  subprice                   double(24,8) DEFAULT 0,    -- prix unitaire
+  total_ht                   double(24,8) DEFAULT 0,    -- Total HT de la ligne toute quantite et incluant remise ligne et globale
+  total_tva                  double(24,8) DEFAULT 0,	  -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
+  total_localtax1            double(24,8) DEFAULT 0,    -- Total Local Tax 1
+  total_localtax2            double(24,8) DEFAULT 0,    -- Total Local Tax 2
+  total_ttc                  double(24,8) DEFAULT 0,	  -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
   product_type		         integer      DEFAULT 0,
   date_start                 datetime     DEFAULT NULL,       -- date debut si service
   date_end                   datetime     DEFAULT NULL,       -- date fin si service
@@ -54,8 +54,8 @@ create table llx_commande_fournisseurdet
   
   fk_multicurrency			integer,
   multicurrency_code		varchar(255),
-  multicurrency_subprice	numeric(24,8) DEFAULT 0,
-  multicurrency_total_ht	numeric(24,8) DEFAULT 0,
-  multicurrency_total_tva	numeric(24,8) DEFAULT 0,
-  multicurrency_total_ttc	numeric(24,8) DEFAULT 0
+  multicurrency_subprice	double(24,8) DEFAULT 0,
+  multicurrency_total_ht	double(24,8) DEFAULT 0,
+  multicurrency_total_tva	double(24,8) DEFAULT 0,
+  multicurrency_total_ttc	double(24,8) DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql
index ae252870fd3..81ba14cca2c 100644
--- a/htdocs/install/mysql/tables/llx_commandedet.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet.sql
@@ -30,42 +30,42 @@ create table llx_commandedet
   description					text,
   vat_src_code					varchar(10)  DEFAULT '',		 -- Vat code used as source of vat fields. Not strict foreign key here.
   tva_tx						double(6,3),	                 -- Vat rate
-  localtax1_tx               	double(6,3)  DEFAULT 0,    		 -- localtax1 rate
-  localtax1_type			 	varchar(10)	  	 NULL, 			 -- localtax1 type
-  localtax2_tx               	double(6,3)  DEFAULT 0,    		 -- localtax2 rate
+  localtax1_tx					double(6,3)  DEFAULT 0,			 -- localtax1 rate
+  localtax1_type			 	varchar(10)  NULL, 				 -- localtax1 type
+  localtax2_tx					double(6,3)  DEFAULT 0,			 -- localtax2 rate
   localtax2_type			 	varchar(10)	  	 NULL, 			 -- localtax2 type
   qty							real,                            -- quantity
   remise_percent				real         DEFAULT 0,          -- pourcentage de remise
   remise						real         DEFAULT 0,          -- montant de la remise
   fk_remise_except				integer      NULL,               -- Lien vers table des remises fixes
   price							real,                            -- prix final
-  subprice						numeric(24,8) DEFAULT 0,         -- P.U. HT (exemple 100)
-  total_ht						numeric(24,8) DEFAULT 0,         -- Total HT de la ligne toute quantite et incluant remise ligne et globale
-  total_tva						numeric(24,8) DEFAULT 0,         -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
-  total_localtax1				numeric(24,8) DEFAULT 0,         -- Total LocalTax1 
-  total_localtax2				numeric(24,8) DEFAULT 0,         -- Total LocalTax2
-  total_ttc						numeric(24,8) DEFAULT 0,         -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
+  subprice						double(24,8) DEFAULT 0,         -- P.U. HT (exemple 100)
+  total_ht						double(24,8) DEFAULT 0,         -- Total HT de la ligne toute quantite et incluant remise ligne et globale
+  total_tva						double(24,8) DEFAULT 0,         -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
+  total_localtax1				double(24,8) DEFAULT 0,         -- Total LocalTax1 
+  total_localtax2				double(24,8) DEFAULT 0,         -- Total LocalTax2
+  total_ttc						double(24,8) DEFAULT 0,         -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
   product_type					integer      DEFAULT 0,
   date_start					datetime     DEFAULT NULL,       -- date debut si service
   date_end						datetime     DEFAULT NULL,       -- date fin si service
   info_bits						integer      DEFAULT 0,          -- TVA NPR ou non
 
-  buy_price_ht					numeric(24,8) DEFAULT 0,         -- buying price
+  buy_price_ht					double(24,8) DEFAULT 0,         -- buying price
   fk_product_fournisseur_price	integer      DEFAULT NULL,       -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
   
   special_code					integer      DEFAULT 0,      -- code pour les lignes speciales
   rang							integer      DEFAULT 0,
-  fk_unit            integer      DEFAULT NULL,           -- lien vers table des unités
+  fk_unit						integer      DEFAULT NULL,           -- lien vers table des unités
   import_key					varchar(14),
   
   fk_commandefourndet			integer DEFAULT NULL,       -- link to detail line of commande fourn (resplenish)
   
   fk_multicurrency				integer,
   multicurrency_code			varchar(255),
-  multicurrency_subprice		numeric(24,8) DEFAULT 0,
-  multicurrency_total_ht		numeric(24,8) DEFAULT 0,
-  multicurrency_total_tva		numeric(24,8) DEFAULT 0,
-  multicurrency_total_ttc		numeric(24,8) DEFAULT 0
+  multicurrency_subprice		double(24,8) DEFAULT 0,
+  multicurrency_total_ht		double(24,8) DEFAULT 0,
+  multicurrency_total_tva		double(24,8) DEFAULT 0,
+  multicurrency_total_ttc		double(24,8) DEFAULT 0
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index efa6614796c..2120f6a5b2b 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -28,7 +28,7 @@ create table llx_don
   tms             timestamp,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
-  amount          numeric(24,8) DEFAULT 0,
+  amount          double(24,8) DEFAULT 0,
   fk_payment      integer,
   paid            smallint default 0 NOT NULL,
   firstname       varchar(50),
diff --git a/htdocs/install/mysql/tables/llx_expensereport_rules.sql b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
index 0a3b6dc0c49..e6103ee8fb9 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_rules.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
@@ -18,17 +18,17 @@
 -- ============================================================================
 
 CREATE TABLE llx_expensereport_rules (
-    rowid integer AUTO_INCREMENT PRIMARY KEY,
-    datec datetime  DEFAULT NULL,
-    tms timestamp,
-    dates datetime NOT NULL,
-    datee datetime NOT NULL,
-    amount numeric(24,8) NOT NULL,
-    restrictive tinyint NOT NULL,
-    fk_user integer DEFAULT NULL,
-    fk_usergroup integer DEFAULT NULL,
-    fk_c_type_fees integer NOT NULL,
-    code_expense_rules_type varchar(50) NOT NULL,
-    is_for_all tinyint DEFAULT '0',
-    entity integer DEFAULT 1
+  rowid						integer AUTO_INCREMENT PRIMARY KEY,
+  datec						datetime  DEFAULT NULL,
+  tms						timestamp,
+  dates						datetime NOT NULL,
+  datee						datetime NOT NULL,
+  amount					double(24,8) NOT NULL,
+  restrictive				tinyint NOT NULL,
+  fk_user					integer DEFAULT NULL,
+  fk_usergroup				integer DEFAULT NULL,
+  fk_c_type_fees			integer NOT NULL,
+  code_expense_rules_type	varchar(50) NOT NULL,
+  is_for_all				tinyint DEFAULT '0',
+  entity					integer DEFAULT 1
 ) ENGINE=InnoDB
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index ae2d3bac96d..7277fa85d47 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -27,16 +27,16 @@ create table llx_loan
   label							varchar(80) NOT NULL,
   fk_bank						integer,
 
-  capital						numeric(24,8) default 0 NOT NULL,
+  capital						double(24,8) default 0 NOT NULL,
   datestart						date,
   dateend						date,
   nbterm						real,
   rate							double  NOT NULL,
 
-  note_private                  text,
-  note_public                   text,
+  note_private					text,
+  note_public					text,
 
-  capital_position				numeric(24,8) default 0,		-- If not a new loan, just have the position of capital
+  capital_position				double(24,8) default 0,		-- If not a new loan, just have the position of capital
   date_position					date,
 
   paid							smallint default 0 NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
index eb43238255a..005ae07528e 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -24,9 +24,9 @@ create table llx_loan_schedule
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	numeric(24,8) DEFAULT 0,
-  amount_insurance	numeric(24,8) DEFAULT 0,
-  amount_interest	numeric(24,8) DEFAULT 0,
+  amount_capital	double(24,8) DEFAULT 0,
+  amount_insurance	double(24,8) DEFAULT 0,
+  amount_interest	double(24,8) DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
   note_private      text,
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
index 086bafae0fa..579628c44af 100644
--- a/htdocs/install/mysql/tables/llx_paiementcharge.sql
+++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql
@@ -23,7 +23,7 @@ create table llx_paiementcharge
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          numeric(24,8) DEFAULT 0,
+  amount          double(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
   num_paiement    varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 126d4df8c2a..3ce0d027ea9 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -19,19 +19,19 @@
 
 create table llx_paiementfourn
 (
-  rowid             integer AUTO_INCREMENT PRIMARY KEY,
-  ref				varchar(30),
-  entity			integer DEFAULT 1,
-  tms               timestamp,
-  datec             datetime,          -- date de creation de l'enregistrement
-  datep             datetime,          -- date de paiement
-  amount            numeric(24,8) DEFAULT 0,    -- montant
-  multicurrency_amount numeric(24,8) DEFAULT 0,    -- multicurrency amount
-  fk_user_author    integer,           -- auteur
-  fk_paiement       integer NOT NULL,  -- moyen de paiement
-  num_paiement      varchar(50),       -- numero de paiement (cheque)
-  note              text,
-  fk_bank           integer NOT NULL,
-  statut			smallint NOT NULL DEFAULT 0,
-  model_pdf         varchar(255)
+  rowid					integer AUTO_INCREMENT PRIMARY KEY,
+  ref					varchar(30),
+  entity				integer DEFAULT 1,
+  tms					timestamp,
+  datec					datetime,          -- date de creation de l'enregistrement
+  datep					datetime,          -- date de paiement
+  amount				double(24,8) DEFAULT 0,    -- montant
+  multicurrency_amount	double(24,8) DEFAULT 0,    -- multicurrency amount
+  fk_user_author		integer,           -- auteur
+  fk_paiement			integer NOT NULL,  -- moyen de paiement
+  num_paiement			varchar(50),       -- numero de paiement (cheque)
+  note					text,
+  fk_bank				integer NOT NULL,
+  statut				smallint NOT NULL DEFAULT 0,
+  model_pdf				varchar(255)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index 1859c7aa796..d452d4da054 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -23,7 +23,7 @@ create table llx_payment_donation
   datec           datetime,           -- date de creation
   tms             timestamp,
   datep           datetime,           -- payment date
-  amount          numeric(24,8) DEFAULT 0,
+  amount          double(24,8) DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),
   note            text,
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 1857246e22e..deeb82f615c 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -23,7 +23,7 @@ create table llx_payment_expensereport
   datec                   datetime,           -- date de creation
   tms                     timestamp,
   datep                   datetime,           -- payment date
-  amount                  numeric(24,8) DEFAULT 0,
+  amount                  double(24,8) DEFAULT 0,
   fk_typepayment          integer NOT NULL,
   num_payment             varchar(50),
   note                    text,
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index 3b6111a7b2f..10801fc7454 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -24,13 +24,13 @@ create table llx_payment_loan
   datec				datetime,         -- creation date
   tms				timestamp,
   datep				datetime,         -- payment date
-  amount_capital	numeric(24,8) DEFAULT 0,
-  amount_insurance	numeric(24,8) DEFAULT 0,
-  amount_interest	numeric(24,8) DEFAULT 0,
+  amount_capital	double(24,8) DEFAULT 0,
+  amount_insurance	double(24,8) DEFAULT 0,
+  amount_interest	double(24,8) DEFAULT 0,
   fk_typepayment	integer NOT NULL,
   num_payment		varchar(50),
-  note_private      text,
-  note_public       text,
+  note_private		text,
+  note_public		text,
   fk_bank			integer NOT NULL,
   fk_user_creat		integer,          -- creation user
   fk_user_modif		integer           -- last modification user
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index d9b0f3f4477..171c356415f 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -24,8 +24,8 @@ create table llx_payment_salary
   fk_user         integer NOT NULL,
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur (this field should not be here, only into bank tables)
-  salary          numeric(24,8),			  -- salary of user when payment was done
-  amount          numeric(24,8) NOT NULL DEFAULT 0,
+  salary          double(24,8),			  -- salary of user when payment was done
+  amount          double(24,8) NOT NULL DEFAULT 0,
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),				  -- ref
   label           varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
index c9cdf7992a2..25e9381afe0 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
@@ -29,7 +29,7 @@ create table llx_prelevement_bons
   ref            varchar(12),        -- reference
   entity         integer DEFAULT 1 NOT NULL, -- multi company id
   datec          datetime,           -- date de creation
-  amount         numeric(24,8) DEFAULT 0, -- montant total du prelevement
+  amount         double(24,8) DEFAULT 0, -- montant total du prelevement
   statut         smallint DEFAULT 0, -- statut
   credite        smallint DEFAULT 0, -- indique si le prelevement a ete credite
   note           text,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
index 1d1b59bf3f5..9da18cbd416 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
@@ -21,7 +21,7 @@ create table llx_prelevement_facture_demande
 (
   rowid               integer AUTO_INCREMENT PRIMARY KEY,
   fk_facture          integer NOT NULL,
-  amount              numeric(24,8) NOT NULL,
+  amount              double(24,8) NOT NULL,
   date_demande        datetime NOT NULL,
   traite              smallint DEFAULT 0,
   date_traite         datetime,
diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
index 448b3846d71..421f8ee4969 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
@@ -24,7 +24,7 @@ create table llx_prelevement_lignes
   statut              smallint DEFAULT 0,
 
   client_nom          varchar(255),
-  amount              numeric(24,8) DEFAULT 0,
+  amount              double(24,8) DEFAULT 0,
   code_banque         varchar(128),
   code_guichet        varchar(6),
   number              varchar(255),
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 38097090a4c..a6a1e51a22b 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -64,7 +64,7 @@ create table llx_societe
   idprof5                  varchar(128),                         		-- IDProf5: nu for france
   idprof6                  varchar(128),                         		-- IDProf6: nu for france
   tva_intra                varchar(20),                         		-- tva
-  capital                  numeric(24,8),                       		-- capital de la societe
+  capital                  double(24,8),                       		-- capital de la societe
   fk_stcomm                integer        DEFAULT 0 NOT NULL,      	-- commercial statut
   note_private             text,                                		--
   note_public              text,                                        --
diff --git a/htdocs/install/mysql/tables/llx_subscription.sql b/htdocs/install/mysql/tables/llx_subscription.sql
index f1a22d6ec83..8d220ed9059 100644
--- a/htdocs/install/mysql/tables/llx_subscription.sql
+++ b/htdocs/install/mysql/tables/llx_subscription.sql
@@ -24,7 +24,7 @@ create table llx_subscription
   fk_adherent     integer,
   dateadh         datetime,
   datef           date,
-  subscription    numeric(24,8),
+  subscription    double(24,8),
   fk_bank         integer DEFAULT NULL,
   note            text
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index c0f680c4824..34ab53a5b22 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -24,7 +24,7 @@ create table llx_tva
   datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
-  amount          numeric(24,8) NOT NULL DEFAULT 0,
+  amount          double(24,8) NOT NULL DEFAULT 0,
   fk_typepayment  integer NULL,
   num_payment     varchar(50),
   label           varchar(255),

From e7832e3c44739b88af4fa7e586ba9a720e2a08ae Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Sun, 29 Oct 2017 07:16:04 +0100
Subject: [PATCH 25/86] Correct PR

---
 .../mysql/tables/llx_accounting_account.sql   | 36 ++++++------
 .../mysql/tables/llx_chargesociales.sql       | 38 ++++++-------
 .../tables/llx_commande_fournisseurdet.sql    | 56 +++++++++----------
 3 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_accounting_account.sql b/htdocs/install/mysql/tables/llx_accounting_account.sql
index cffa7624e15..385d6b43bc8 100644
--- a/htdocs/install/mysql/tables/llx_accounting_account.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_account.sql
@@ -1,7 +1,7 @@
 -- ============================================================================
--- Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
--- Copyright (C) 2014	   Juanjo Menent	   <jmenent@2byte.es>
--- Copyright (C) 2016	   Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
+-- Copyright (C) 2004-2006  Laurent Destailleur <eldy@users.sourceforge.net>
+-- Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
+-- Copyright (C) 2016       Alexandre Spangaro  <aspangaro.dolibarr@gmail.com>
 --
 -- 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
@@ -21,20 +21,20 @@
 
 create table llx_accounting_account
 (
-  rowid           			integer AUTO_INCREMENT PRIMARY KEY,
-  entity          			integer DEFAULT 1 NOT NULL,
-  datec           			datetime,
-  tms             			timestamp,
-  fk_pcg_version  			varchar(32)  NOT NULL,
-  pcg_type        			varchar(20)  NOT NULL,
-  pcg_subtype     			varchar(20)  NOT NULL,
-  account_number  			varchar(32)  NOT NULL,
-  account_parent  			varchar(32)  DEFAULT '0',							-- Hierarchic parent TODO Move this as integer, it is a foreign key of llx_accounting_account.rowid
-  label           			varchar(255) NOT NULL,
-  fk_accounting_category 	integer DEFAULT 0,
-  fk_user_author  			integer DEFAULT NULL,
-  fk_user_modif   			integer DEFAULT NULL,
-  active     	  			tinyint DEFAULT 1  NOT NULL,
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  entity                    integer DEFAULT 1 NOT NULL,
+  datec                     datetime,
+  tms                       timestamp,
+  fk_pcg_version            varchar(32)  NOT NULL,
+  pcg_type                  varchar(20)  NOT NULL,
+  pcg_subtype               varchar(20)  NOT NULL,
+  account_number            varchar(32)  NOT NULL,
+  account_parent            varchar(32)  DEFAULT '0',         -- Hierarchic parent TODO Move this as integer, it is a foreign key of llx_accounting_account.rowid
+  label                     varchar(255) NOT NULL,
+  fk_accounting_category    integer      DEFAULT 0,
+  fk_user_author            integer      DEFAULT NULL,
+  fk_user_modif             integer      DEFAULT NULL,
+  active                    tinyint      DEFAULT 1  NOT 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_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index c32198dd6e6..a22937fa643 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -20,25 +20,25 @@
 
 create table llx_chargesociales
 (
-  rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  ref               varchar(16),				   -- 'TX....'
-  date_ech			datetime NOT NULL,             -- date echeance
-  libelle			varchar(80) NOT NULL,
-  entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
-  tms				timestamp,
-  date_creation		datetime,						-- date de creation 
-  date_valid		datetime,						-- date de validation
-  fk_user_author	integer,						-- user making creation
-  fk_user_modif		integer,                        -- user making last change
-  fk_user_valid		integer,						-- user validating
-  fk_type			integer NOT NULL,
-  fk_account		integer,                       -- bank account
-  fk_mode_reglement	integer,                -- mode de reglement
-  amount			double(24,8) default 0 NOT NULL,
-  paye				smallint default 0 NOT NULL,
-  periode			date,
-  fk_projet			integer DEFAULT NULL,
-  import_key		varchar(14)
+  rowid             integer AUTO_INCREMENT PRIMARY KEY,
+  ref               varchar(16),                    -- 'TX....'
+  date_ech          datetime NOT NULL,              -- date echeance
+  libelle           varchar(80) NOT NULL,
+  entity            integer DEFAULT 1 NOT NULL,     -- multi company id
+  tms               timestamp,
+  date_creation     datetime,                       -- date de creation 
+  date_valid        datetime,                       -- date de validation
+  fk_user_author    integer,                        -- user making creation
+  fk_user_modif     integer,                        -- user making last change
+  fk_user_valid     integer,                        -- user validating
+  fk_type           integer NOT NULL,
+  fk_account        integer,                        -- bank account
+  fk_mode_reglement integer,                        -- mode de reglement
+  amount            double(24,8) default 0 NOT NULL,
+  paye              smallint default 0 NOT NULL,
+  periode           date,
+  fk_projet         integer DEFAULT NULL,
+  import_key        varchar(14)
 )ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
index dd9dc40c412..dfbf4e261eb 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
@@ -1,8 +1,8 @@
 -- ===================================================================
--- Copyright (C) 2007      Rodolphe Quiedeville	<rodolphe@quiedeville.org>
--- Copyright (C) 2007-2009 Laurent Destailleur	<eldy@users.sourceforge.net>
--- Copyright (C) 2010-2012 Juanjo Menent		<jmenent@2byte.es>
--- Copyright (C) 2015      Marcos García    <marcosgdf@gmail.com>
+-- Copyright (C) 2007      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2007-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
+-- Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
 --
 -- 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
@@ -23,39 +23,39 @@ create table llx_commande_fournisseurdet
 (
   rowid                      integer AUTO_INCREMENT PRIMARY KEY,
   fk_commande                integer      NOT NULL,
-  fk_parent_line             integer NULL,
+  fk_parent_line             integer      NULL,
   fk_product                 integer,
-  ref                        varchar(50),  -- supplier product ref
-  label                      varchar(255), -- product label
+  ref                        varchar(50),               -- supplier product ref
+  label                      varchar(255),              -- product label
   description                text,
-  vat_src_code				 varchar(10)  DEFAULT '',	-- Vat code used as source of vat fields. Not strict foreign key here.
+  vat_src_code               varchar(10)  DEFAULT '',   -- Vat code used as source of vat fields. Not strict foreign key here.
   tva_tx                     double(6,3)  DEFAULT 0,    -- taux tva
-  localtax1_tx               double(24,8) DEFAULT 0,    -- localtax1 rate
-  localtax1_type			 varchar(10)	  NULL, 		-- localtax1 type
-  localtax2_tx               double(24,8) DEFAULT 0,    -- localtax2 rate
-  localtax2_type			 varchar(10)	  NULL, 		-- localtax2 type
+  localtax1_tx               double(6,3)  DEFAULT 0,    -- localtax1 rate
+  localtax1_type             varchar(10)  NULL,         -- localtax1 type
+  localtax2_tx               double(6,3)  DEFAULT 0,    -- localtax2 rate
+  localtax2_type             varchar(10)  NULL,         -- localtax2 type
   qty                        real,                      -- quantity
   remise_percent             real         DEFAULT 0,    -- pourcentage de remise
   remise                     real         DEFAULT 0,    -- montant de la remise
   subprice                   double(24,8) DEFAULT 0,    -- prix unitaire
   total_ht                   double(24,8) DEFAULT 0,    -- Total HT de la ligne toute quantite et incluant remise ligne et globale
-  total_tva                  double(24,8) DEFAULT 0,	  -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
+  total_tva                  double(24,8) DEFAULT 0,    -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
   total_localtax1            double(24,8) DEFAULT 0,    -- Total Local Tax 1
   total_localtax2            double(24,8) DEFAULT 0,    -- Total Local Tax 2
-  total_ttc                  double(24,8) DEFAULT 0,	  -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
-  product_type		         integer      DEFAULT 0,
-  date_start                 datetime     DEFAULT NULL,       -- date debut si service
-  date_end                   datetime     DEFAULT NULL,       -- date fin si service
-  info_bits	                 integer      DEFAULT 0,     -- TVA NPR ou non
-  special_code				 integer      DEFAULT 0,      -- code pour les lignes speciales
-  rang						 integer      DEFAULT 0,
-  import_key				 varchar(14),
-  fk_unit         integer    DEFAULT NULL,
+  total_ttc                  double(24,8) DEFAULT 0,    -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
+  product_type               integer      DEFAULT 0,
+  date_start                 datetime     DEFAULT NULL, -- date debut si service
+  date_end                   datetime     DEFAULT NULL, -- date fin si service
+  info_bits	                 integer      DEFAULT 0,    -- TVA NPR ou non
+  special_code               integer      DEFAULT 0,    -- code pour les lignes speciales
+  rang                       integer      DEFAULT 0,
+  import_key                 varchar(14),
+  fk_unit                    integer      DEFAULT NULL,
   
-  fk_multicurrency			integer,
-  multicurrency_code		varchar(255),
-  multicurrency_subprice	double(24,8) DEFAULT 0,
-  multicurrency_total_ht	double(24,8) DEFAULT 0,
-  multicurrency_total_tva	double(24,8) DEFAULT 0,
-  multicurrency_total_ttc	double(24,8) DEFAULT 0
+  fk_multicurrency           integer,
+  multicurrency_code         varchar(255),
+  multicurrency_subprice     double(24,8) DEFAULT 0,
+  multicurrency_total_ht     double(24,8) DEFAULT 0,
+  multicurrency_total_tva    double(24,8) DEFAULT 0,
+  multicurrency_total_ttc    double(24,8) DEFAULT 0
 )ENGINE=innodb;

From d569218162d181dc6913f6fa23264de07632bd05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Oct 2017 11:00:02 +0100
Subject: [PATCH 26/86] Fix 'separate' extrafields must be visible by default.
 Sandardize name of list pages (must end with _list.php)

---
 htdocs/adherents/list.php                        |  2 +-
 htdocs/admin/mails_senderprofile_list.php        |  2 +-
 htdocs/comm/propal/list.php                      |  2 +-
 htdocs/commande/list.php                         |  2 +-
 htdocs/compta/bank/bankentries_list.php          |  2 +-
 htdocs/compta/bank/list.php                      |  2 +-
 htdocs/compta/facture/invoicetemplate_list.php   |  2 +-
 htdocs/compta/facture/list.php                   |  2 +-
 htdocs/contact/list.php                          |  2 +-
 htdocs/contrat/class/contrat.class.php           |  4 ++--
 htdocs/contrat/index.php                         |  8 ++++----
 htdocs/contrat/list.php                          |  2 +-
 .../contrat/{services.php => services_list.php}  |  6 +++---
 htdocs/core/actions_extrafields.inc.php          | 12 ++++++++++--
 htdocs/core/class/html.form.class.php            |  4 ++--
 htdocs/core/menus/init_menu_auguria.sql          | 10 +++++-----
 htdocs/core/menus/standard/eldy.lib.php          | 10 +++++-----
 htdocs/core/tpl/admin_extrafields_add.tpl.php    | 16 +++++++++-------
 htdocs/core/tpl/admin_extrafields_edit.tpl.php   |  6 ++++--
 htdocs/expedition/list.php                       |  2 +-
 htdocs/expensereport/list.php                    |  2 +-
 htdocs/fichinter/list.php                        |  2 +-
 htdocs/fourn/commande/list.php                   |  2 +-
 htdocs/fourn/facture/list.php                    |  2 +-
 htdocs/install/mysql/migration/6.0.0-7.0.0.sql   |  1 +
 htdocs/langs/en_US/modulebuilder.lang            |  2 +-
 htdocs/modulebuilder/template/myobject_list.php  |  2 +-
 htdocs/product/inventory/list.php                |  2 +-
 htdocs/product/list.php                          |  2 +-
 htdocs/product/stock/productlot_list.php         |  2 +-
 htdocs/projet/list.php                           |  2 +-
 htdocs/projet/tasks/list.php                     |  2 +-
 htdocs/projet/tasks/time.php                     |  2 +-
 htdocs/societe/list.php                          |  2 +-
 htdocs/societe/website.php                       |  2 +-
 htdocs/supplier_proposal/list.php                |  2 +-
 htdocs/user/index.php                            |  2 +-
 37 files changed, 72 insertions(+), 59 deletions(-)
 rename htdocs/contrat/{services.php => services_list.php} (99%)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 71c0e223f92..a41d310abfe 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -130,7 +130,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 2190705ea8b..e695ca122b4 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -116,7 +116,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ebca22f8114..a7fe6b05201 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -158,7 +158,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c792f42f00e..e007953bfe3 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -142,7 +142,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index a829cdc8cba..5e79874ae8f 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -151,7 +151,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
     }
 }
 
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 19120e12888..23df6a44285 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -103,7 +103,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
     }
 }
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index c7c13b1628a..b1b95b99f7b 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -138,7 +138,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index c0bf0233f89..1f45a7cec3e 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -174,7 +174,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 4b0356c8e52..a97e6687126 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -160,7 +160,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
    }
 }
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 6cb29d94008..0379bafc15f 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2089,10 +2089,10 @@ class Contrat extends CommonObject
 			if ($mode == 'inactives') {
 				$warning_delay = $conf->contrat->services->inactifs->warning_delay;
 				$label = $langs->trans("BoardNotActivatedServices");
-				$url = DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=0';
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=0';
 			} else {
 				$warning_delay = $conf->contrat->services->expires->warning_delay;
-				$url = DOL_URL_ROOT.'/contrat/services.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4&amp;filter=expired';
+				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4&amp;filter=expired';
 				$label = $langs->trans("BoardRunningServices");
 			}
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 2d818f8001d..e0874d41595 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -190,7 +190,7 @@ foreach($listofstatus as $status)
 
         print '<tr class="oddeven">';
         print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
-        print '<td align="right"><a href="services.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
+        print '<td align="right"><a href="services_list.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
         print "</tr>\n";
     }
     if ($status==4 && ! $bool) $bool=true;
@@ -210,7 +210,7 @@ foreach($listofstatus as $status)
     {
     	print '<tr class="oddeven">';
     	print '<td>'.$staticcontratligne->LibStatut($status,0,($bool?1:0)).'</td>';
-    	print '<td align="right"><a href="services.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
+    	print '<td align="right"><a href="services_list.php?mode='.$status.($bool?'&filter=expired':'').'">'.($nb[$status.$bool]?$nb[$status.$bool]:0).' '.$staticcontratligne->LibStatut($status,3,($bool?1:0)).'</a></td>';
     	if ($status==4 && ! $bool) $bool=true;
     	else $bool=false;
         print "</tr>\n";
@@ -468,7 +468,7 @@ if ($resql)
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=0"><span class="badge">'.$num.'</span></a></th>';
+	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("NotActivatedServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?mode=0"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
 	while ($i < $num)
@@ -548,7 +548,7 @@ if ($resql)
 
 	print '<table class="noborder" width="100%">';
 
-	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
+	print '<tr class="liste_titre"><th colspan="4">'.$langs->trans("ListOfExpiredServices").' <a href="'.DOL_URL_ROOT.'/contrat/services_list.php?mode=4&amp;filter=expired"><span class="badge">'.$num.'</span></a></th>';
 	print "</tr>\n";
 
 	while ($i < $num)
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 611eae49e4c..38bfef6ebe2 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -137,7 +137,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services_list.php
similarity index 99%
rename from htdocs/contrat/services.php
rename to htdocs/contrat/services_list.php
index 84a7fd17cc2..c25311b84da 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services_list.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	    \file       htdocs/contrat/services.php
+ *	    \file       htdocs/contrat/services_list.php
  *      \ingroup    contrat
  *		\brief      Page to list services in contracts
  */
@@ -134,7 +134,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
@@ -272,7 +272,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 //print $sql;
-dol_syslog("contrat/services.php", LOG_DEBUG);
+dol_syslog("contrat/services_list.php", LOG_DEBUG);
 $resql=$db->query($sql);
 if (! $resql)
 {
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 798a43b8d96..6b6d40acd9c 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -160,6 +160,10 @@ if ($action == 'add')
     				}
     			}
 
+    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+    			$visibility = GETPOST('list', 'alpha');
+				if ($type == 'separate') $visibility=3;
+
                 $result=$extrafields->addExtraField(
                 	GETPOST('attrname', 'alpha'),
                 	GETPOST('label', 'alpha'),
@@ -173,7 +177,7 @@ if ($action == 'add')
                 	$params,
                 	(GETPOST('alwayseditable', 'alpha')?1:0),
                 	(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
-                	GETPOST('list', 'alpha'),				// Same as visible -1=not visible by default in list, 1=visible, 0=not visible in list
+                	$visibility,
 					0,
                     GETPOST('computed_value','alpha'),
                 	(GETPOST('entitycurrentorall', 'alpha')?0:''),
@@ -323,6 +327,10 @@ if ($action == 'update')
     				}
     			}
 
+    			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
+    			$visibility = GETPOST('list', 'alpha');
+    			if ($type == 'separate') $visibility=3;
+
     			$result=$extrafields->update(
     				GETPOST('attrname', 'alpha'),
     				GETPOST('label', 'alpha'),
@@ -335,7 +343,7 @@ if ($action == 'update')
     				$params,
     				(GETPOST('alwayseditable', 'alpha')?1:0),
     				(GETPOST('perms', 'alpha')?GETPOST('perms', 'alpha'):''),
-                	GETPOST('list', 'alpha'),				// Same as visible -1=not visible by default in list, 1=visible, 0=not visible in list
+                	$visibility,
 					0,
     			    GETPOST('default_value','alpha'),
     				GETPOST('computed_value','alpha'),
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6f36b586352..e7ed9b121f7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5642,9 +5642,9 @@ class Form
 
 
 	/**
-	 *	Show a multiselect form from an array.
+	 *	Show a multiselect dropbox from an array.
 	 *
-	 *	@param	string	$htmlname		Name of select
+	 *	@param	string	$htmlname		Name of HTML field
 	 *	@param	array	$array			Array with array of fields we could show. This array may be modified according to setup of user.
 	 *  @param  string  $varpage        Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
 	 *	@return	string					HTML multiselect string
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 4d4801c35fe..1ad0a76a203 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -154,11 +154,11 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1400__+MAX_llx_menu__, 'commercial', 'contracts', 5__+MAX_llx_menu__, '/contrat/index.php?leftmenu=contracts', 'Contracts', 0, 'contracts', '$user->rights->contrat->lire', '', 2, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/card.php?&action=create&amp;leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1402__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/list.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1403__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&amp;mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1405__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&amp;mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1406__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1407__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services.php?leftmenu=contracts&amp;mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1403__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/services_list.php?leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1404__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?leftmenu=contracts&amp;mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1405__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?leftmenu=contracts&amp;mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1406__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1407__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?leftmenu=contracts&amp;mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3, __ENTITY__);
 -- Commercial - Interventions
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1500__+MAX_llx_menu__, 'commercial', 'ficheinter', 5__+MAX_llx_menu__, '/fichinter/list.php?leftmenu=ficheinter', 'Interventions', 0, 'interventions', '$user->rights->ficheinter->lire', '', 2, 8, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1501__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/card.php?action=create&amp;leftmenu=ficheinter', 'NewIntervention', 1, 'interventions', '$user->rights->ficheinter->creer', '', 2, 0, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3af93cbcbf6..8dcd39f31fa 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -768,11 +768,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);
 				$newmenu->add("/contrat/card.php?action=create&amp;leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->rights->contrat->creer);
 				$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
-				$newmenu->add("/contrat/services.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu=="contracts") $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);
 			}
 
 			// Interventions
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 2d8304b7f99..ec25a82b7f1 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -35,9 +35,10 @@ $langs->load("modulebuilder");
     jQuery(document).ready(function() {
     	function init_typeoffields(type)
     	{
-        	console.log("selected type is "+type);
-    		var size = jQuery("#size");
+        	console.log("We select a new type = "+type);
+        	var size = jQuery("#size");
     		var computed_value = jQuery("#computed_value");
+    		var langfile = jQuery("#langfile");
     		var default_value = jQuery("#default_value");
     		var unique = jQuery("#unique");
     		var required = jQuery("#required");
@@ -51,7 +52,7 @@ $langs->load("modulebuilder");
 
     		if (GETPOST('type','alpha') == "separate")
     		{
-				print "jQuery('#size, #default_value').val('').prop('disabled', true);";
+				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
     			print 'jQuery("#value_choice").hide();';
     		}
     		?>
@@ -93,7 +94,7 @@ $langs->load("modulebuilder");
 			else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();}
 			else if (type == 'link')     { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();}
 			else if (type == 'separate') {
-				size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true);
+				langfile.val('').prop('disabled',true);size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true);
 				jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();
 			}
 			else {	// type = string
@@ -104,12 +105,13 @@ $langs->load("modulebuilder");
 			if (type == 'separate')
 			{
 				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.removeAttr('checked').prop('disabled', true);
-				jQuery('#size, #default_value').val('').prop('disabled', true);
+				jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);
+				jQuery('#list').val(3);
 			}
 			else
 			{
 				default_value.removeAttr('disabled');
-				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.removeAttr('disabled');
+				langfile.removeAttr('disabled');required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.removeAttr('disabled');
 			}
     	}
     	init_typeoffields('<?php echo GETPOST('type','alpha'); ?>');
@@ -162,7 +164,7 @@ $langs->load("modulebuilder");
 <!-- Position -->
 <tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOST('pos','int'); ?>"></td></tr>
 <!-- Language file -->
-<tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile','alpha')); ?>"></td></tr>
+<tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile','alpha')); ?>"></td></tr>
 <!-- Computed Value -->
 <tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('computed_value','none')?GETPOST('computed_value','none'):''); ?>"></td></tr>
 <!-- Default Value (at sql setup level) -->
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index fcd073d77db..2d10df38cb1 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -37,6 +37,7 @@ $langs->load("modulebuilder");
         	console.log("select new type "+type);
     		var size = jQuery("#size");
     		var computed_value = jQuery("#computed_value");
+    		var langfile = jQuery("#langfile");
     		var default_value = jQuery("#default_value");
     		var unique = jQuery("#unique");
     		var required = jQuery("#required");
@@ -50,7 +51,7 @@ $langs->load("modulebuilder");
 
     		if (GETPOST('type','alpha') == "separate")
     		{
-				print "jQuery('#size, #default_value').val('').prop('disabled', true);";
+				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
     			print 'jQuery("#value_choice").hide();';
     		}
     		?>
@@ -99,7 +100,8 @@ $langs->load("modulebuilder");
 			if (type == 'separate')
 			{
 				required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.removeAttr('checked').prop('disabled', true);
-				jQuery('#size, #default_value').val('').prop('disabled', true);
+				jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);
+				jQuery('#list').val(3);
 			}
 			else
 			{
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 009e163eeb0..6cada0b16a9 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -111,7 +111,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 3110aa37459..30d5eea98d6 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -123,7 +123,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
     }
 }
 
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 1398cef1a24..3b4aca20951 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -119,7 +119,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
    }
 }
 
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index f1bd5738cc8..5194d6296bb 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -158,7 +158,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 94df346aae4..508a9e28117 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -175,7 +175,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index 9d37b981fed..e534c793ac8 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -353,6 +353,7 @@ ALTER TABLE llx_extrafields ADD COLUMN tms timestamp;
 
 -- We fix value of 'list' from 0 to 1 for all extrafields created before this migration
 UPDATE llx_extrafields SET list = 1 WHERE list = 0 AND fk_user_author IS NULL and fk_user_modif IS NULL and datec IS NULL;		
+UPDATE llx_extrafields SET list = 3 WHERE type = 'separate' AND list != 3;		
 
 ALTER TABLE llx_extrafields MODIFY COLUMN list integer DEFAULT 1;
 --VPGSQL8.2 ALTER TABLE llx_extrafields ALTER COLUMN list SET DEFAULT 1;
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index a66e8b636cf..ceedb00707a 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -71,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 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. Using a negative value means field is not shown by default on list but can be selected for viewing)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 27295472b61..36b70170b86 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -130,7 +130,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 33900ed8a9a..39be799db47 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -100,7 +100,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
     foreach($extrafields->attribute_label as $key => $val)
     {
-        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
     }
 }
 
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index f45fa51e24c..2d956043c40 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -183,7 +183,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
    }
 }
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index bc98b7ef12f..920bbac8a9b 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -114,7 +114,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
    }
 }
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 435ef5fc538..08c22f30a37 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -137,7 +137,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
    }
 }
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 12c8eb2038e..d44dc3ec4b8 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -127,7 +127,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 85e05c41f96..215a7ace2d0 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -622,7 +622,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 	    {
 	        foreach($extrafields->attribute_label as $key => $val)
 	        {
-        		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+				if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	        }
 	    }
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 2082bcfa552..974db015a2c 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -197,7 +197,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
    }
 }
 
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 7a17e05c827..ca6065628ff 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -97,7 +97,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 9471e7efadc..d3ce6ce6a27 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -157,7 +157,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
 	}
 }
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 981704de6ae..7e5820dac66 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -102,7 +102,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 {
    foreach($extrafields->attribute_label as $key => $val)
    {
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
    }
 }
 

From 78645c718f44106edd5d00398003ec77bf0e4f2c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Oct 2017 16:15:54 +0100
Subject: [PATCH 27/86] Fix position of quick search

---
 htdocs/core/ajax/selectsearchbox.php | 64 ++++++++++++++--------------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 0861ef160b6..2d92bc8f938 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -49,92 +49,92 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 //global $hookmanager;
 $hookmanager->initHooks(array('searchform'));
 
-$search_boxvalue=GETPOST('q', 'none');
+$search_boxvalue=GETPOST('q');
 
 $arrayresult=array();
 
 // Define $searchform
 if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintothirdparty']=array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintothirdparty']=array('img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
 {
-	$arrayresult['searchintocontact']=array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php?sall='.urlencode($search_boxvalue));
-}
-
-if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
-{
-	$arrayresult['searchintomember']=array('position'=>20, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintocontact']=array('img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
 && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
 {
-	$arrayresult['searchintoproduct']=array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintoproduct']=array('img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue),'text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintoprojects']=array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue));
+	$arrayresult['searchintoprojects']=array('img'=>'object_projectpub', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue));
 }
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
 {
-	$arrayresult['searchintotasks']=array('position'=>45, 'img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php?search_all='.urlencode($search_boxvalue));
+	$arrayresult['searchintotasks']=array('img'=>'object_task', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('','object_task').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php?search_all='.urlencode($search_boxvalue));
+}
+
+if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
+{
+	$arrayresult['searchintomember']=array('img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue));
+}
+
+if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
+{
+	$arrayresult['searchintouser']=array('img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/index.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
 {
-    $arrayresult['searchintopropal']=array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php?sall='.urlencode($search_boxvalue));
+    $arrayresult['searchintopropal']=array('img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php?sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
 {
-	$arrayresult['searchintoorder']=array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php?sall='.urlencode($search_boxvalue));
-}
-if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
-{
-    $arrayresult['searchintoshipment']=array('position'=>80, 'img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintoorder']=array('img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php?sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
 {
-	$arrayresult['searchintoinvoice']=array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintoinvoice']=array('img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php?sall='.urlencode($search_boxvalue));
+}
+if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
+{
+    $arrayresult['searchintoshipment']=array('img'=>'object_sending', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('','object_sending').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
 {
-	$arrayresult['searchintosupplierpropal']=array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintosupplierpropal']=array('img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php?sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
 {
-	$arrayresult['searchintosupplierorder']=array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode($search_boxvalue));
+	$arrayresult['searchintosupplierorder']=array('img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode($search_boxvalue));
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
 {
-	$arrayresult['searchintosupplierinvoice']=array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintosupplierinvoice']=array('img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
 {
-	$arrayresult['searchintocontract']=array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintocontract']=array('img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php?sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
 {
-	$arrayresult['searchintointervention']=array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php?sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintointervention']=array('img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php?sall='.urlencode($search_boxvalue));
 }
-
 // HR
-if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
-{
-	$arrayresult['searchintouser']=array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/index.php?sall='.urlencode($search_boxvalue));
-}
 if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
 {
-	$arrayresult['searchintoexpensereport']=array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
+	$arrayresult['searchintoexpensereport']=array('img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
 }
 if (! empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
 {
-    $arrayresult['searchintoleaves']=array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
+    $arrayresult['searchintoleaves']=array('img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('','object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&sall='.urlencode($search_boxvalue));
 }
 
 
@@ -147,7 +147,7 @@ if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLO
 */
 
 // Execute hook addSearchEntry
-$parameters=array('search_boxvalue'=>$search_boxvalue, 'arrayresult'=>$arrayresult);
+$parameters=array('search_boxvalue'=>$search_boxvalue);
 $reshook=$hookmanager->executeHooks('addSearchEntry',$parameters);
 if (empty($reshook))
 {
@@ -155,8 +155,6 @@ if (empty($reshook))
 }
 else $arrayresult=$hookmanager->resArray;
 
-// Sort on position
-$arrayresult = dol_sort_array($arrayresult, 'position');
 
 // Print output if called by ajax or do nothing (var $arrayresult will be used) if called by an include
 if (! isset($usedbyinclude) || empty($usedbyinclude))

From 0de1b878bd50209849bb39b26c6df2fa8b2a4e12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Oct 2017 16:17:52 +0100
Subject: [PATCH 28/86] Prepare 6.0.4

---
 htdocs/filefunc.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 624808dd0d9..7e7f2de8492 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','6.0.3');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (! defined('DOL_VERSION')) define('DOL_VERSION','6.0.4');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (! defined('EURO')) define('EURO',chr(128));
 

From 33aa0f3160720368312164d3936f91bbc6c92eae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Oct 2017 17:49:24 +0100
Subject: [PATCH 29/86] Code comment

---
 htdocs/core/class/html.formactions.class.php |  2 +-
 htdocs/core/lib/functions.lib.php            | 25 +++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 7d5bffb6e54..3cadc82ae21 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -258,7 +258,7 @@ class FormActions
 		        		{
 		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef,'hour');
 		        		}
-		        		else print '-'.dol_print_date($action->datef,'dayhour');
+		        		else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
 	        		}
 	        		print '</td>';
 	        		print '<td align="right">';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index abcb2d00ade..85ea597644d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1610,7 +1610,7 @@ function dol_strftime($fmt, $ts=false, $is_gmt=false)
  *										"day", "daytext", "dayhour", "dayhourldap", "dayhourtext", "dayrfc", "dayhourrfc", "...reduceformat"
  * 	@param	string		$tzoutput		true or 'gmt' => string is for Greenwich location
  * 										false or 'tzserver' => output string is for local PHP server TZ usage
- * 										'tzuser' => output string is for user TZ (current browser TZ with current dst)
+ * 										'tzuser' => output string is for user TZ (current browser TZ with current dst) => In a future, we should have same behaviour than 'tzuserrel'
  *                                      'tzuserrel' => output string is for user TZ (current browser TZ with dst or not, depending on date position) (TODO not implemented yet)
  *	@param	Translate	$outputlangs	Object lang that contains language for text translation.
  *  @param  boolean		$encodetooutput false=no convert into output pagecode
@@ -1641,8 +1641,8 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 			{
 				$to_gmt=true;
 				$offsettzstring=(empty($_SESSION['dol_tz_string'])?'UTC':$_SESSION['dol_tz_string']);	// Example 'Europe/Berlin' or 'Indian/Reunion'
-				$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;
-				$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;
+				$offsettz=(empty($_SESSION['dol_tz'])?0:$_SESSION['dol_tz'])*60*60;		// Will not be used anymore
+				$offsetdst=(empty($_SESSION['dol_dst'])?0:$_SESSION['dol_dst'])*60*60;	// Will not be used anymore
 			}
 		}
 	}
@@ -1699,8 +1699,9 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i',$time,$reg)
 	|| preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i',$time,$reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
 	{
-		// This part of code should not be used. TODO Remove this.
-		dol_syslog("Functions.lib::dol_print_date function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_WARNING);
+		// TODO Remove this.
+		// This part of code should not be used.
+		dol_syslog("Functions.lib::dol_print_date function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_ERR);
 		// Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'
 		$syear	= (! empty($reg[1]) ? $reg[1] : '');
 		$smonth	= (! empty($reg[2]) ? $reg[2] : '');
@@ -1710,22 +1711,26 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 		$ssec	= (! empty($reg[6]) ? $reg[6] : '');
 
 		$time=dol_mktime($shour,$smin,$ssec,$smonth,$sday,$syear,true);
-		$ret=adodb_strftime($format, $time+$offsettz+$offsetdst, $to_gmt);			// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+		$ret=adodb_strftime($format, $time+$offsettz+$offsetdst, $to_gmt);
 	}
 	else
 	{
 		// Date is a timestamps
 		if ($time < 100000000000)	// Protection against bad date values
 		{
-			$ret=adodb_strftime($format, $time+$offsettz+$offsetdst, $to_gmt);		// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+			$timetouse = $time+$offsettz+$offsetdst;	// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+
+			$ret=adodb_strftime($format, $timetouse, $to_gmt);
 		}
 		else $ret='Bad value '.$time.' for date';
 	}
 
 	if (preg_match('/__b__/i',$format))
 	{
+		$timetouse = $time+$offsettz+$offsetdst;	// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+
 		// Here ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.
-		$month=adodb_strftime('%m', $time+$offsettz+$offsetdst);					// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+		$month=adodb_strftime('%m', $timetouse);
 		$month=sprintf("%02d", $month);	// $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.
 		if ($encodetooutput)
 		{
@@ -1745,7 +1750,9 @@ function dol_print_date($time,$format='',$tzoutput='tzserver',$outputlangs='',$e
 	}
 	if (preg_match('/__a__/i',$format))
 	{
-		$w=adodb_strftime('%w', $time+$offsettz+$offsetdst);						// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+		$timetouse = $time+$offsettz+$offsetdst;	// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
+
+		$w=adodb_strftime('%w', $timetouse);						// TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 		$dayweek=$outputlangs->transnoentitiesnoconv('Day'.$w);
 		$ret=str_replace('__A__',$dayweek,$ret);
 		$ret=str_replace('__a__',dol_substr($dayweek,0,3),$ret);

From 02cae88a8cd84f2f0231fd3b3f2a28de848ddd03 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Oct 2017 17:50:50 +0100
Subject: [PATCH 30/86] Fix date output

---
 htdocs/core/class/html.formactions.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 3cadc82ae21..7db6ec3331a 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -249,14 +249,14 @@ class FormActions
 	        		print $action->type;
 	        		print '</td>';
 	        		print '<td>'.$label.'</td>';
-	        		print '<td align="center">'.dol_print_date($action->datep,'dayhour');
+	        		print '<td align="center">'.dol_print_date($action->datep, 'dayhour', 'tzuserrel');
 	        		if ($action->datef)
 	        		{
 		        		$tmpa=dol_getdate($action->datep);
 		        		$tmpb=dol_getdate($action->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef,'hour');
+		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour', 'tzuserrel');
 		        		}
 		        		else print '-'.dol_print_date($action->datef, 'dayhour', 'tzuserrel');
 	        		}

From 64107b76253c4f49119d50cbc2f3f98c95828ce1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Oct 2017 18:53:08 +0100
Subject: [PATCH 31/86] Include module name in generated sql files

---
 htdocs/modulebuilder/index.php                | 24 +++++++++----------
 ....key.sql => llx_mymodule_myobject.key.sql} |  6 ++---
 ...myobject.sql => llx_mymodule_myobject.sql} |  2 +-
 ... => llx_mymodule_myobject_extrafields.sql} |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)
 rename htdocs/modulebuilder/template/sql/{llx_myobject.key.sql => llx_mymodule_myobject.key.sql} (71%)
 rename htdocs/modulebuilder/template/sql/{llx_myobject.sql => llx_mymodule_myobject.sql} (96%)
 rename htdocs/modulebuilder/template/sql/{llx_myobject_extrafields.sql => llx_mymodule_myobject_extrafields.sql} (95%)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index d128b9df5b9..41aca4c904f 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -126,9 +126,9 @@ if ($dirins && $action == 'initmodule' && $modulename)
 		dol_delete_file($destdir.'/myobject_list.php');
 		dol_delete_file($destdir.'/lib/myobject.lib.php');
 		dol_delete_file($destdir.'/test/phpunit/MyObjectTest.php');
-		dol_delete_file($destdir.'/sql/llx_myobject.sql');
-		dol_delete_file($destdir.'/sql/llx_myobject_extrafields.sql');
-		dol_delete_file($destdir.'/sql/llx_myobject.key.sql');
+		dol_delete_file($destdir.'/sql/llx_mymodule_myobject.sql');
+		dol_delete_file($destdir.'/sql/llx_mymodule_myobject_extrafields.sql');
+		dol_delete_file($destdir.'/sql/llx_mymodule_myobject.key.sql');
 		dol_delete_file($destdir.'/scripts/myobject.php');
 		dol_delete_file($destdir.'/img/object_myobject.png');
 		dol_delete_file($destdir.'/class/myobject.class.php');
@@ -220,9 +220,9 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 			'myobject_list.php'=>strtolower($objectname).'_list.php',
 			'lib/myobject.lib.php'=>'lib/'.strtolower($objectname).'.lib.php',
 			'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
-			'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
-			'sql/llx_myobject_extrafields.sql'=>'sql/llx_'.strtolower($objectname).'_extrafields.sql',
-			'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
+			'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
+			'sql/llx_mymodule_myobject_extrafields.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
+			'sql/llx_mymodule_myobject.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
 			'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
 			'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
 			'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
@@ -507,9 +507,9 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 			'myobject_list.php'=>strtolower($objectname).'_list.php',
 			'lib/myobject.lib.php'=>'lib/'.strtolower($objectname).'.lib.php',
 			'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.$objectname.'Test.php',
-			'sql/llx_myobject.sql'=>'sql/llx_'.strtolower($objectname).'.sql',
-			'sql/llx_myobject_extrafields.sql'=>'sql/llx_'.strtolower($objectname).'_extrafields.sql',
-			'sql/llx_myobject.key.sql'=>'sql/llx_'.strtolower($objectname).'.key.sql',
+			'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
+			'sql/llx_mymodule_myobject_extrafields.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
+			'sql/llx_mymodule_myobject.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
 			'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
 			'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
 			'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
@@ -1421,9 +1421,9 @@ elseif (! empty($module))
 						$pathtolist     = strtolower($module).'/'.strtolower($tabobj).'_list.php';
 						$pathtonote     = strtolower($module).'/'.strtolower($tabobj).'_note.php';
 						$pathtophpunit  = strtolower($module).'/test/phpunit/'.$tabobj.'Test.php';
-						$pathtosql      = strtolower($module).'/sql/llx_'.strtolower($tabobj).'.sql';
-						$pathtosqlextra = strtolower($module).'/sql/llx_'.strtolower($tabobj).'_extrafields.sql';
-						$pathtosqlkey   = strtolower($module).'/sql/llx_'.strtolower($tabobj).'.key.sql';
+						$pathtosql      = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.sql';
+						$pathtosqlextra = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'_extrafields.sql';
+						$pathtosqlkey   = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.key.sql';
 						$pathtolib      = strtolower($module).'/lib/'.strtolower($tabobj).'.lib.php';
 						$pathtopicto    = strtolower($module).'/img/object_'.strtolower($tabobj).'.png';
 
diff --git a/htdocs/modulebuilder/template/sql/llx_myobject.key.sql b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql
similarity index 71%
rename from htdocs/modulebuilder/template/sql/llx_myobject.key.sql
rename to htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql
index ef96d309224..6e301744fa6 100644
--- a/htdocs/modulebuilder/template/sql/llx_myobject.key.sql
+++ b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql
@@ -15,10 +15,10 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_myobject ADD INDEX idx_fieldobject (fieldobject);
+ALTER TABLE llx_mymodule_myobject ADD INDEX idx_fieldobject (fieldobject);
 -- END MODULEBUILDER INDEXES
 
---ALTER TABLE llx_myobject ADD UNIQUE INDEX uk_myobject_fieldxyz(fieldx, fieldy);
+--ALTER TABLE llx_mymodule_myobject ADD UNIQUE INDEX uk_mymodule_myobject_fieldxyz(fieldx, fieldy);
 
---ALTER TABLE llx_myobject ADD CONSTRAINT llx_myobject_field_id FOREIGN KEY (fk_field) REFERENCES llx_myotherobject(rowid);
+--ALTER TABLE llx_mymodule_myobject ADD CONSTRAINT llx_mymodule_myobject_field_id FOREIGN KEY (fk_field) REFERENCES llx_myotherobject(rowid);
 
diff --git a/htdocs/modulebuilder/template/sql/llx_myobject.sql b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
similarity index 96%
rename from htdocs/modulebuilder/template/sql/llx_myobject.sql
rename to htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
index fe38ca63653..0470739573a 100644
--- a/htdocs/modulebuilder/template/sql/llx_myobject.sql
+++ b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
@@ -14,7 +14,7 @@
 -- along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
-CREATE TABLE llx_myobject(
+CREATE TABLE llx_mymodule_myobject(
 	-- BEGIN MODULEBUILDER FIELDS
 	rowid INTEGER AUTO_INCREMENT PRIMARY KEY,
 	entity INTEGER DEFAULT 1 NOT NULL,
diff --git a/htdocs/modulebuilder/template/sql/llx_myobject_extrafields.sql b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.sql
similarity index 95%
rename from htdocs/modulebuilder/template/sql/llx_myobject_extrafields.sql
rename to htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.sql
index 2e505a9b99e..70b6afe9824 100644
--- a/htdocs/modulebuilder/template/sql/llx_myobject_extrafields.sql
+++ b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.sql
@@ -13,7 +13,7 @@
 -- 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_myobject_extrafields
+create table llx_mymodule_myobject_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
   tms                       timestamp,

From cd5c678534c204c8e24593d7f460ccaceb7b6076 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Sun, 29 Oct 2017 19:01:42 +0100
Subject: [PATCH 32/86] Only update new lot number

---
 htdocs/expedition/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 83898b5bf19..838e34e44d0 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -684,7 +684,7 @@ if (empty($reshook))
 						$batch="batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
 						$qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
 						$batch_id = GETPOST($batch,'int');
-						if (! empty($batch_id))
+						if (! empty($batch_id) && $batch_id != $detail_batch->fk_origin_stock)
 						{
 							if ($lotStock->fetch($batch_id) > 0) 
 							{
@@ -2163,10 +2163,10 @@ else if ($id || $ref)
 						// Qty to ship or shipped
 						print '<td>' . '<input name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->dluo_qty.'">' . '</td>';
 						// Batch number managment
-						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, 0, '', 0). '</td>';
+						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product). '</td>';
 						print '</tr>';
 					}
-				} 
+				}
 				else if (! empty($conf->stock->enabled))
 				{
 					if ($lines[$i]->entrepot_id > 0)

From bb5bfabd7d420fc58c289ae1a6cfb1302149117f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Oct 2017 20:08:09 +0100
Subject: [PATCH 33/86] Enhance the script purge-data.php to purge remote
 database

---
 dev/initdata/purge-data.php | 45 ++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index f89a3ba2698..8944a89e591 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -78,15 +78,17 @@ $sqls=array(
         'DELETE FROM '.MAIN_DB_PREFIX.'propaldet',
         'DELETE FROM '.MAIN_DB_PREFIX.'propal',
     ),
-    'supplier_order'=>array(
+    'supplier_proposal'=>array(
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
+        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
+    ),
+	'supplier_order'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet',
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur',
     ),
-    'supplier_invoice'=>array(
+	'supplier_invoice'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det',
         'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn',
-        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
-        'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
     ),
     'delivery'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'livraisondet',
@@ -128,12 +130,13 @@ $sqls=array(
     ),
     'thirdparty'=>array(
         '@contact',
-        'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons', 
+        'DELETE FROM '.MAIN_DB_PREFIX.'cabinetmed_cons',
         'UPDATE '.MAIN_DB_PREFIX.'adherent SET fk_soc = NULL',
         'DELETE FROM '.MAIN_DB_PREFIX.'categorie_fournisseur',
         'DELETE FROM '.MAIN_DB_PREFIX.'categorie_societe',
         'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except',
-        'DELETE FROM '.MAIN_DB_PREFIX.'societe',
+        'DELETE FROM '.MAIN_DB_PREFIX.'societe_rib',
+    	'DELETE FROM '.MAIN_DB_PREFIX.'societe',
     )
 );
 
@@ -152,27 +155,37 @@ $mode = $argv[1];
 $option = $argv[2];
 
 if (empty($mode) || ! in_array($mode,array('test','confirm'))) {
-    print "Usage:  $script_file (test|confirm) (all|option)\n";
+    print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
     print "\n";
     print "option can be ".implode(',',array_keys($sqls))."\n";
     exit(-1);
 }
 
 if (empty($option) || ! in_array($option, array_merge(array('all'),array_keys($sqls))) ) {
-    print "Usage:  $script_file (test|confirm) (all|option)\n";
+    print "Usage:  $script_file (test|confirm) (all|option) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
     print "\n";
     print "option can be ".implode(',',array_keys($sqls))."\n";
     exit(-1);
 }
 
+// Replace database handler
+if (! empty($argv[3]))
+{
+	$db->close();
+	unset($db);
+	$db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
+	$user=new User($db);
+}
 
+//var_dump($user->db->database_name);
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+	print 'An admin user with login "admin" must exists to use this script.'."\n";
 	exit;
 }
-$user->getrights();
+//$user->getrights();
+
 
 print "Purge all data for this database:\n";
 print "Server = ".$db->database_host."\n";
@@ -190,14 +203,14 @@ if (! $confirmed)
 
 /**
  * Process sql requests of a family
- * 
+ *
  * @param   string  $family     Name of family key of array $sqls
  * @return  int                 -1 if KO, 1 if OK
  */
 function processfamily($family)
 {
     global $db, $sqls;
-    
+
     $error=0;
     foreach($sqls[$family] as $sql)
     {
@@ -207,7 +220,7 @@ function processfamily($family)
             processfamily($newfamily);
             continue;
         }
-        
+
         print "Run sql: ".$sql."\n";
         $resql=$db->query($sql);
         if (! $resql)
@@ -217,7 +230,7 @@ function processfamily($family)
                 $error++;
             }
         }
-    
+
         if ($error)
         {
             print $db->lasterror();
@@ -225,7 +238,7 @@ function processfamily($family)
             break;
         }
     }
-    
+
     if ($error) return -1;
     else return 1;
 }
@@ -242,7 +255,7 @@ foreach($sqls as $family => $familysql)
     $oldfamily = $family;
 
     $result=processfamily($family);
-    if ($result < 0) 
+    if ($result < 0)
     {
         $error++;
         break;

From 0d09e1d22378e01db95fa9b7da46f5917cca62d4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Oct 2017 20:12:02 +0100
Subject: [PATCH 34/86] Enhance purge

---
 dev/initdata/purge-data.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index 8944a89e591..f992dcb2dc6 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -116,8 +116,10 @@ $sqls=array(
         'DELETE FROM '.MAIN_DB_PREFIX.'product_lang',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_price',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price',
-        'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
-        'DELETE FROM '.MAIN_DB_PREFIX.'product',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_batch',
+    	'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_lot',
+    	'DELETE FROM '.MAIN_DB_PREFIX.'product',
     ),
     'project'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'projet_task_time',

From a9ceb46f978a61bdcab70b4648e59e5326707580 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Sun, 29 Oct 2017 20:40:56 +0100
Subject: [PATCH 35/86] Add parameter to load all lot from lines of object in
 cache

If you want use the lot stock selector in mutiple lines you can add
lines array. If you don't give a product id or a lines array, no lot
numbers will be loaded.
---
 .../product/class/html.formproduct.class.php  | 153 +++++++++++-------
 1 file changed, 93 insertions(+), 60 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 96a7d35f62b..02c7bcddd0d 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2008-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2016	   Francis Appels       <francis.appels@yahoo.com>
+ * Copyright (C) 2015-2017 Francis Appels       <francis.appels@yahoo.com>
  *
  * 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
@@ -338,8 +338,9 @@ class FormProduct
 	 *  @param  string	$filterstatus	lot status filter, following comma separated filter options can be used
 	 *  @param  int		$empty			1=Can be empty, 0 if not
 	 * 	@param	int		$disabled		1=Select is disabled
-	 * 	@param	int		$fk_product		show lot numbers of product with id fk_product. All if 0.
-	 * 	@param	int		$fk_entrepot	show lot numbers in warehouse with id fk_entrepot. All if 0.
+	 * 	@param	int		$fk_product		show lot numbers of product with id fk_product. All from objectLines if 0.
+	 * 	@param	int		$fk_entrepot	filter lot numbers for warehouse with id fk_entrepot. All if 0.
+	 * 	@param	array	$objectLines	Only cache lot numbers for products in lines of object. If no lines only for fk_product. If no fk_product, all.
 	 *  @param	string	$empty_label	Empty label if needed (only if $empty=1)
 	 *  @param	int		$forcecombo		1=Force combo iso ajax select2
 	 *  @param	array	$events			Events to add to select2
@@ -347,15 +348,26 @@ class FormProduct
 	 *
 	 * 	@return	string					HTML select
 	 */
-	function selectLotStock($selected='',$htmlname='batch_id',$filterstatus='',$empty=0,$disabled=0,$fk_product=0,$fk_entrepot=0,$empty_label='', $forcecombo=0, $events=array(), $morecss='minwidth200')
+	function selectLotStock($selected='',$htmlname='batch_id',$filterstatus='',$empty=0,$disabled=0,$fk_product=0,$fk_entrepot=0,$objectLines = array(),$empty_label='', $forcecombo=0, $events=array(), $morecss='minwidth200')
 	{
 		global $langs;
 
 		dol_syslog(get_class($this)."::selectLot $selected, $htmlname, $filterstatus, $empty, $disabled, $fk_product, $fk_entrepot, $empty_label, $showstock, $forcecombo, $morecss",LOG_DEBUG);
 
 		$out='';
+		$productIdArray = array();
+		if (! is_array($objectLines) || ! count($objectLines))
+		{
+			if (! empty($fk_product)) $productIdArray[] = $fk_product;
+		}
+		else
+		{
+			foreach ($objectLines as $line) {
+				if ($line->fk_product) $productIdArray[] = $line->fk_product;
+			}
+		}
 
-		$nboflot = $this->loadLotStock($fk_product, $fk_entrepot);
+		$nboflot = $this->loadLotStock($productIdArray);
 
 		if ($conf->use_javascript_ajax && ! $forcecombo)
 		{
@@ -366,15 +378,33 @@ class FormProduct
 
 		$out.='<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled':'').' id="'.$htmlname.'" name="'.($htmlname.($disabled?'_disabled':'')).'">';
 		if ($empty) $out.='<option value="-1">'.($empty_label?$empty_label:'&nbsp;').'</option>';
-		foreach($this->cache_lot as $id => $arraytypes)
+		if (! empty($fk_product))
 		{
-			$out.='<option value="'.$id.'"';
-			if ($selected == $id || ($selected == 'ifone' && $nboflot == 1)) $out.=' selected';
-			$out.='>';
-			$out.=$arraytypes['entrepot_label'].' - ';
-			$out.=$arraytypes['batch'];
-			$out.=' ('.$langs->trans("Stock").':'.$arraytypes['qty'].')';
-			$out.='</option>';
+			$productIdArray = array($fk_product); // only show lot stock for product
+		}
+		else 
+		{
+			foreach($this->cache_lot as $key => $value)
+			{
+				$productIdArray[] = $key;
+			}
+		}
+		
+		foreach($productIdArray as $productId)
+		{
+			foreach($this->cache_lot[$productId] as $id => $arraytypes)
+			{
+				if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id'])
+				{
+					$out.='<option value="'.$id.'"';
+					if ($selected == $id || ($selected == 'ifone' && $nboflot == 1)) $out.=' selected';
+					$out.='>';
+					$out.=$arraytypes['entrepot_label'].' - ';
+					$out.=$arraytypes['batch'];
+					$out.=' ('.$langs->trans("Stock").':'.$arraytypes['qty'].')';
+					$out.='</option>';
+				}
+			}
 		}
 		$out.='</select>';
 		if ($disabled) $out.='<input type="hidden" name="'.$htmlname.'" value="'.(($selected>0)?$selected:'').'">';
@@ -386,70 +416,73 @@ class FormProduct
 	 * Load in cache array list of lot available in stock
 	 * If fk_product is not 0, we do not use cache
 	 *
-	 * @param	int		$fk_product		    load lot of id fk_product, all if 0. 
+	 * @param	array	$productIdArray		array of product id's from who to get lot numbers. A
 	 * @param	string	$fk_entrepot	    load lot in fk_entrepot all if 0.
 	 *
-	 * @return  int  		    		    Nb of loaded lines, 0 if already loaded, <0 if KO
+	 * @return  int  		    		    Nb of loaded lines, 0 if nothing loaded, <0 if KO
 	 */
-	function loadLotStock($fk_product = 0, $fk_entrepot = 0)
+	private function loadLotStock($productIdArray = array())
 	{
 		global $conf, $langs;
 
-		if (empty($fk_product) && empty($fk_product) && count($this->cache_lot))
+		$cacheLoaded = false;
+		if (empty($productIdArray))
 		{
-			return count($this->cache_lot); // Cache already loaded and we do not want a list with information specific to a product or warehouse
+			// only Load lot stock for given products
+			$this->cache_lot = array();
+			return 0;
+		}
+		if (count($productIdArray) && count($this->cache_lot))
+		{
+			// check cache already loaded for product id's
+			foreach ($productIdArray as $productId) 
+			{
+				$cacheLoaded = ! empty($this->cache_lot[$productId]) ? true : false;
+			}
+		}
+		if ($cacheLoaded) 
+		{
+			return count($this->cache_lot);
 		}
 		else 
 		{
-			// clear cache;
+			// clear cache
 			$this->cache_lot = array();
-		}
-
-		$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.label";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.rowid = pb.fk_product_stock";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (".getEntity('stock').")";
-		if (!empty($fk_product) || !empty($fk_entrepot))
-		{
-			$sql.= " WHERE";
-			if (!empty($fk_product))
+			$productIdList = implode(',', $productIdArray);
+			$sql = "SELECT pb.batch, pb.rowid, ps.fk_entrepot, pb.qty, e.label, ps.fk_product";
+			$sql.= " FROM ".MAIN_DB_PREFIX."product_batch as pb";
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.rowid = pb.fk_product_stock";
+			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (".getEntity('stock').")";
+			if (!empty($productIdList))
 			{
-				$sql.= " ps.fk_product = '".$fk_product."'";
-				if (!empty($fk_entrepot))
+				$sql.= " WHERE ps.fk_product IN (".$productIdList.")";
+			}
+			$sql.= " ORDER BY e.label, pb.batch";
+	
+			dol_syslog(get_class($this).'::loadLotStock', LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+				$i = 0;
+				while ($i < $num)
 				{
-					$sql.= " AND";
+					$obj = $this->db->fetch_object($resql);
+					$this->cache_lot[$obj->fk_product][$obj->rowid]['id'] =$obj->rowid;
+					$this->cache_lot[$obj->fk_product][$obj->rowid]['batch']=$obj->batch;
+					$this->cache_lot[$obj->fk_product][$obj->rowid]['entrepot_id']=$obj->fk_entrepot;
+					$this->cache_lot[$obj->fk_product][$obj->rowid]['entrepot_label']=$obj->label;
+					$this->cache_lot[$obj->fk_product][$obj->rowid]['qty'] = $obj->qty;
+					$i++;
 				}
+	
+				return $num;
 			}
-			if (!empty($fk_entrepot))
+			else
 			{
-				$sql.= " ps.fk_entrepot = '".$fk_entrepot."'";
+				dol_print_error($this->db);
+				return -1;
 			}
 		}
-		$sql.= " ORDER BY e.label, pb.batch";
-
-		dol_syslog(get_class($this).'::loadLotStock', LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-				$this->cache_lot[$obj->rowid]['id'] =$obj->rowid;
-				$this->cache_lot[$obj->rowid]['batch']=$obj->batch;
-				$this->cache_lot[$obj->rowid]['entrepot_id']=$obj->fk_entrepot;
-				$this->cache_lot[$obj->rowid]['entrepot_label']=$obj->label;
-				$this->cache_lot[$obj->rowid]['qty'] = $obj->qty;
-				$i++;
-			}
-
-			return $num;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
 	}
 }
\ No newline at end of file

From 76b0e7ee5a8982046adc617353729f5ff2a6640e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Oct 2017 21:24:54 +0100
Subject: [PATCH 36/86] NEW Add option
 PROPOSAL/ORDER/INVOICE_ALLOW_EXTERNAL_DOWNLOAD

---
 htdocs/core/class/commonobject.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2f1a56c5595..1ae79e0c8fe 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4091,7 +4091,12 @@ abstract class CommonObject
 						$ecmfile=new EcmFiles($this->db);
 						$result = $ecmfile->fetch(0, '', ($rel_dir?$rel_dir.'/':'').$filename);
 
-						if (! empty($conf->global->PROPOSAL_USE_ONLINE_SIGN))
+						// Set the public "share" key
+						$setsharekey = false;
+						if ($this->element == 'propal'   && ! 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 == 'facture'  && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))  $setsharekey=true;
+						if ($setsharekey)
 						{
 							if (empty($ecmfile->share))	// Because object not found or share not set yet
 							{

From bbe1c9c494a4edb41ddf979845961a8f0255b472 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Oct 2017 00:45:47 +0100
Subject: [PATCH 37/86] NEW Can download PDF document from the payment page

---
 htdocs/core/ajax/ajaxdirpreview.php      |  4 +-
 htdocs/core/class/commonobject.class.php | 85 ++++++++++++++++++++++++
 htdocs/document.php                      | 50 +++++++++-----
 htdocs/ecm/class/ecmfiles.class.php      |  8 ++-
 htdocs/ecm/docfile.php                   | 80 +++++++++++++++-------
 htdocs/langs/en_US/errors.lang           |  1 +
 htdocs/langs/en_US/main.lang             |  1 +
 htdocs/public/payment/newpayment.php     | 41 ++++++------
 htdocs/theme/eldy/style.css.php          |  4 +-
 htdocs/theme/md/style.css.php            |  4 +-
 10 files changed, 212 insertions(+), 66 deletions(-)

diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 203bd71e645..2607002dff3 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -89,9 +89,7 @@ else    // For no ajax call
 if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
 
 // Load traductions files
-$langs->load("ecm");
-$langs->load("companies");
-$langs->load("other");
+$langs->loadLangs(array("ecm","companies","other"));
 
 // Security check
 if ($user->societe_id > 0) $socid = $user->societe_id;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1ae79e0c8fe..4bffc579a8c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -553,6 +553,90 @@ abstract class CommonObject
 		return $out;
 	}
 
+	/**
+	 * Return the link of last main doc file for direct public download.
+	 *
+	 * @param	string	$modulepart			Module related to document
+	 * @param	int		$initsharekey		Init the share key if it was not yet defined
+	 * @return	string						Link or empty string if there is no download link
+	 */
+	function getLastMainDocLink($modulepart, $initsharekey=0)
+	{
+		global $user, $dolibarr_main_url_root;
+
+		if (empty($this->last_main_doc))
+		{
+			return '';		// No known last doc
+		}
+
+		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+		$ecmfile=new EcmFiles($this->db);
+		$result = $ecmfile->fetch(0, '', $this->last_main_doc);
+		if ($result < 0)
+		{
+			$this->error = $ecmfile->error;
+			$this->errors = $ecmfile->errors;
+			return -1;
+		}
+
+		if (empty($ecmfile->id))
+		{
+			// Add entry into index
+			if ($initsharekey)
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+				// TODO We can't, we dont' have full path of file, only last_main_doc adn ->element, so we must rebuild full path first
+				/*
+				$ecmfile->filepath = $rel_dir;
+				$ecmfile->filename = $filename;
+				$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->share = getRandomPassword(true);
+				$result = $ecmfile->create($user);
+				if ($result < 0)
+				{
+					$this->error = $ecmfile->error;
+					$this->errors = $ecmfile->errors;
+				}
+				*/
+			}
+			else return '';
+		}
+		elseif (empty($ecmfile->share))
+		{
+			// Add entry into index
+			if ($initsharekey)
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+				$ecmfile->share = getRandomPassword(true);
+				$ecmfile->update($user);
+			}
+			else return '';
+		}
+
+		// Define $urlwithroot
+		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+		$forcedownload=1;
+		$rellink='/document.php?modulepart='.$modulepart;
+		if ($forcedownload) $rellink.='&attachment=1';
+		if (! empty($ecmfile->entity)) $rellink.='&entity='.$ecmfile->entity;
+		//$rellink.='&file='.urlencode($filepath);		// No need of name of file for public link, we will use the hash
+		$fulllink=$urlwithroot.$rellink;
+		//if (! empty($object->ref))       $fulllink.='&hashn='.$object->ref;			// Hash of file path
+		//elseif (! empty($object->label)) $fulllink.='&hashc='.$object->label;		// Hash of file content
+		if (! empty($ecmfile->share))  $fulllink.='&hashp='.$ecmfile->share;			// Hash for public share
+
+		// Here $ecmfile->share is defined
+		return $fulllink;
+	}
+
+
 	/**
 	 *  Add a link between element $this->element and a contact
 	 *
@@ -4120,6 +4204,7 @@ abstract class CommonObject
 						}
 						else
 						{
+							$ecmfile->entity = $conf->entity;
 							$ecmfile->filepath = $rel_dir;
 							$ecmfile->filename = $filename;
 							$ecmfile->label = md5_file(dol_osencode($destfull));	// hash of file content
diff --git a/htdocs/document.php b/htdocs/document.php
index a0b764882f8..42ad848a0d7 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -31,12 +31,18 @@
  */
 
 define('NOTOKENRENEWAL',1); // Disables token renewal
-// Pour autre que bittorrent, on charge environnement + info issus de logon (comme le user)
+// For bittorent link, we don't need to load/check we are into a login session
 if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'bittorrent' && ! defined("NOLOGIN"))
 {
 	define("NOLOGIN",1);
 	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 }
+// For direct external download link, we don't need to load/check we are into a login session
+if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))
+{
+	define("NOLOGIN",1);
+	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+}
 if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
 if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
 if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
@@ -111,21 +117,23 @@ if (! empty($hashp))
 	$result = $ecmfile->fetch(0, '', '', '', $hashp);
 	if ($result > 0)
 	{
-		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepatch is relative to document directory
+		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepath is relative to document directory
 		$moduleparttocheck = $tmp[0];
 		if ($moduleparttocheck == $modulepart)
 		{
+			// We remove first level of directory
 			$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir
 			//var_dump($original_file); exit;
 		}
 		else
 		{
-			accessforbidden('Bad link. File owns to another module part.',0,0,1);
+			accessforbidden('Bad link. File is from another module part.',0,0,1);
 		}
 	}
 	else
 	{
-		accessforbidden('Bad link. File was not found or sharing attribute removed recently.',0,0,1);
+		$langs->load("errors");
+		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"),0,0,1);
 	}
 }
 
@@ -138,30 +146,38 @@ $refname=basename(dirname($original_file)."/");
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
+
 $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file'];               // $fullpath_original_file is now a full path name
 
-// Basic protection (against external users only)
-if ($user->societe_id > 0)
+if (! empty($hashp))
 {
-	if ($sqlprotectagainstexternals)
+	$accessallowed = 1;			// When using hashp, link is public so we force $accessallowed
+}
+else
+{
+	// Basic protection (against external users only)
+	if ($user->societe_id > 0)
 	{
-		$resql = $db->query($sqlprotectagainstexternals);
-		if ($resql)
+		if ($sqlprotectagainstexternals)
 		{
-			$num=$db->num_rows($resql);
-			$i=0;
-			while ($i < $num)
+			$resql = $db->query($sqlprotectagainstexternals);
+			if ($resql)
 			{
-				$obj = $db->fetch_object($resql);
-				if ($user->societe_id != $obj->fk_soc)
+				$num=$db->num_rows($resql);
+				$i=0;
+				while ($i < $num)
 				{
-					$accessallowed=0;
-					break;
+					$obj = $db->fetch_object($resql);
+					if ($user->societe_id != $obj->fk_soc)
+					{
+						$accessallowed=0;
+						break;
+					}
+					$i++;
 				}
-				$i++;
 			}
 		}
 	}
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 8e9f5c6557e..a329adfd116 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -112,6 +112,7 @@ class EcmFiles //extends CommonObject
 		}
 		if (isset($this->filepath)) {
 			 $this->filepath = trim($this->filepath);
+			 $this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath);		// Remove last /
 		}
 		if (isset($this->fullpath_orig)) {
 			 $this->fullpath_orig = trim($this->fullpath_orig);
@@ -164,6 +165,11 @@ class EcmFiles //extends CommonObject
 		$maxposition=$maxposition+1;
 
 		// Check parameters
+		if (empty($this->filename) || empty($this->filepath))
+		{
+			$this->errors[] = 'Bad property filename or filepath';
+			return -1;
+		}
 		// Put here code to add control on parameters values
 
 		// Insert request
@@ -349,7 +355,7 @@ class EcmFiles //extends CommonObject
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index f6719d08604..339df01b88a 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -64,7 +64,7 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="label";
 
-$section=GETPOST("section");
+$section=GETPOST("section",'alpha');
 if (! $section)
 {
     dol_print_error('','Error, section parameter missing');
@@ -101,7 +101,7 @@ $filepathtodocument=$relativetodocument.$file->label;
 // Try to load object from index
 $object = new ECMFiles($db);
 $result=$object->fetch(0, '', $filepathtodocument);
-if (! ($result >= 0))
+if ($result < 0)
 {
 	dol_print_error($db, $object->error, $object->errors);
 	exit;
@@ -109,7 +109,6 @@ if (! ($result >= 0))
 
 
 
-
 /*
  * Actions
  */
@@ -124,7 +123,7 @@ if ($cancel)
     }
     else
     {
-        header("Location: ".DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.$urlfile.'&section='.$section);
+        header("Location: ".DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
         exit;
     }
 }
@@ -140,13 +139,18 @@ if ($action == 'update')
 
     //$db->begin();
 
-    $olddir=$ecmdir->getRelativePath(0);
+    $olddir=$ecmdir->getRelativePath(0);			// Relative to ecm
+    $olddirrelativetodocument = 'ecm/'.$olddir;		// Relative to document
+    $newdirrelativetodocument = 'ecm/'.$olddir;
     $olddir=$conf->ecm->dir_output.'/'.$olddir;
     $newdir=$olddir;
 
     $oldfile=$olddir.$oldlabel;
     $newfile=$newdir.$newlabel;
 
+    // Now we update index of file
+    $db->begin();
+
     //print $oldfile.' - '.$newfile;
     if ($newlabel != $oldlabel)
     {
@@ -157,29 +161,52 @@ if ($action == 'update')
             setEventMessages($langs->trans('ErrorFailToRenameFile',$oldfile,$newfile), null, 'errors');
             $error++;
         }
-    }
 
-    // Now we update index of file
-    $db->begin();
+        // Reload object after the move
+        $result=$object->fetch(0, '', $newdirrelativetodocument.$newlabel);
+        if ($result < 0)
+        {
+        	dol_print_error($db, $object->error, $object->errors);
+        	exit;
+        }
+    }
 
     if (! $error)
     {
-		if (is_object($object))
+		if ($shareenabled)
 		{
-			if ($shareenabled)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-				$object->share = getRandomPassword(true);
-			}
-			else
-			{
-				$object->share = '';
-			}
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+			$object->share = getRandomPassword(true);
+		}
+		else
+		{
+			$object->share = '';
+		}
+
+		if ($object->id > 0)
+		{
+			// Call update to set the share key
 			$result = $object->update($user);
 			if ($result < 0)
 			{
-				$error++;
-				setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'warnings');
+			}
+		}
+		else
+		{
+			// Call create to insert record
+			$object->entity = $conf->entity;
+			$object->filepath = preg_replace('/[\\/]+$/', '', $newdirrelativetodocument);
+			$object->filename = $newlabel;
+			$object->label = md5_file(dol_osencode($newfile));	// hash of file content
+			$object->fullpath_orig = '';
+			$object->gen_or_uploaded = 'unknown';
+			$object->description = '';    // indexed content
+			$object->keyword = '';        // keyword content
+			$result = $object->create($user);
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'warnings');
 			}
 		}
     }
@@ -187,7 +214,10 @@ if ($action == 'update')
     if (!$error)
     {
         $db->commit();
+
         $urlfile=$newlabel;
+        header("Location: ".DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
+        exit;
     }
     else
     {
@@ -297,6 +327,7 @@ $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($
 $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
+// Link for internal download
 print '<tr><td>'.$langs->trans("DirectDownloadInternalLink").'</td><td>';
 $modulepart='ecm';
 $forcedownload=1;
@@ -308,9 +339,10 @@ $fulllink=$urlwithroot.$rellink;
 print img_picto('','object_globe.png').' ';
 if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadinternallink" name="downloadinternellink" value="'.dol_escape_htmltag($fulllink).'">';
 else print $fulllink;
-if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';		// No target here.
 print '</td></tr>';
 
+// Link for direct external download
 print '<tr><td>';
 if ($action != 'edit') print $langs->trans("DirectDownloadLink");
 else print $langs->trans("FileSharedViaALink");
@@ -332,7 +364,7 @@ if (! empty($object->share))
 		print img_picto('','object_globe.png').' ';
 		if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 		else print $fulllink;
-		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';
+		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>';	// No target here
 	}
 	else
 	{
@@ -374,7 +406,7 @@ if ($action == 'edit')
 // Confirmation de la suppression d'une ligne categorie
 if ($action == 'delete_file')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($_GET["section"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile',$urlfile), 'confirm_deletefile', '', 1, 1);
+    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile',$urlfile), 'confirm_deletefile', '', 1, 1);
 
 }
 
@@ -385,7 +417,7 @@ if ($action != 'edit')
 
     if ($user->rights->ecm->setup)
     {
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
+        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
 
         //print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=cancel&section='.$section.'&urlfile='.urlencode($urlfile).'&backtopage='.urlencode($backtourl).'">'.$langs->trans('Cancel').'</a>';
     }
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index b61d81c6d48..77a4ba76383 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -202,6 +202,7 @@ ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action. 
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
+ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.  
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index bb1bda2fba1..127fbfb929d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -805,6 +805,7 @@ SomeTranslationAreUncomplete=Some languages may be partially translated or may c
 DirectDownloadLink=Direct download link (public/external)
 DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
 Download=Download
+DownloadDocument=Download document
 ActualizeCurrency=Update currency rate
 Fiscalyear=Fiscal year
 ModuleBuilder=Module Builder
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 3e86972db1d..2b456e2d486 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -626,14 +626,12 @@ if (! $source)
 	$fulltag=$tag;
 
 	// Creditor
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Amount
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -653,7 +651,6 @@ if (! $source)
 	print '</td></tr>'."\n";
 
 	// Tag
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -700,29 +697,32 @@ if ($source == 'order')
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$order->thirdparty->name.'</b>';
 
 	// Object
-
 	$text='<b>'.$langs->trans("PaymentOrderRef",$order->ref).'</b>';
 	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
 	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($order->ref).'">';
+	$directdownloadlink = $order->getLastMainDocLink('commande');
+	if ($directdownloadlink)
+	{
+		print '<br><a href="'.$directdownloadlink.'">';
+		print img_mime($order->last_main_doc,'').' ';
+		print $langs->trans("DownloadDocument").'</a>';
+	}
 	print '</td></tr>'."\n";
 
 	// Amount
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -742,7 +742,6 @@ if ($source == 'order')
 	print '</td></tr>'."\n";
 
 	// Tag
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
@@ -815,29 +814,32 @@ if ($source == 'invoice')
 	$fulltag=dol_string_unaccent($fulltag);
 
 	// Creditor
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.dol_escape_htmltag($creditor).'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$invoice->thirdparty->name.'</b>';
 
 	// Object
-
 	$text='<b>'.$langs->trans("PaymentInvoiceRef",$invoice->ref).'</b>';
 	if (GETPOST('desc','alpha')) $text='<b>'.$langs->trans(GETPOST('desc','alpha')).'</b>';
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
 	print '<input type="hidden" name="s" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->ref).'">';
+	$directdownloadlink = $invoice->getLastMainDocLink('facture');
+	if ($directdownloadlink)
+	{
+		print '<br><a href="'.$directdownloadlink.'">';
+		print img_mime($invoice->last_main_doc,'').' ';
+		print $langs->trans("DownloadDocument").'</a>';
+	}
 	print '</td></tr>'."\n";
 
 	// Amount
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -910,6 +912,7 @@ if ($source == 'contractline')
 
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
+	$contract=new Contrat($db);
 	$contractline=new ContratLigne($db);
 
 	$result=$contractline->fetch('',$ref);
@@ -924,7 +927,6 @@ if ($source == 'contractline')
 		{
 			$object = $contractline;
 
-			$contract=new Contrat($db);
 			$result=$contract->fetch($contractline->fk_contrat);
 			if ($result > 0)
 			{
@@ -987,19 +989,16 @@ if ($source == 'contractline')
 	if (GETPOST('qty')) $qty=GETPOST('qty');
 
 	// Creditor
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$creditor.'</b>';
 	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
 	print '</td></tr>'."\n";
 
 	// Debitor
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$contract->thirdparty->name.'</b>';
 
 	// Object
-
 	$text='<b>'.$langs->trans("PaymentRenewContractId",$contract->ref,$contractline->ref).'</b>';
 	if ($contractline->fk_product)
 	{
@@ -1019,10 +1018,16 @@ if ($source == 'contractline')
 	print '</td><td class="CTableRow'.($var?'1':'2').'">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
 	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($contractline->ref).'">';
+	$directdownloadlink = $contract->getLastMainDocLink('contract');
+	if ($directdownloadlink)
+	{
+		print '<br><a href="'.$directdownloadlink.'">';
+		print img_mime($invoice->last_main_doc,'').' ';
+		print $langs->trans("DownloadDocument").'</a>';
+	}
 	print '</td></tr>'."\n";
 
 	// Quantity
-
 	$label=$langs->trans("Quantity");
 	$qty=1;
 	$duration='';
@@ -1050,7 +1055,6 @@ if ($source == 'contractline')
 	print '</b></td></tr>'."\n";
 
 	// Amount
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Amount");
 	if (empty($amount)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var?'1':'2').'">';
@@ -1070,7 +1074,6 @@ if ($source == 'contractline')
 	print '</td></tr>'."\n";
 
 	// Tag
-
 	print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$fulltag.'</b>';
 	print '<input type="hidden" name="tag" value="'.$tag.'">';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 8d3f4bcf0b9..2ffb2836f15 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -348,12 +348,14 @@ input.buttongen {
 	vertical-align: middle;
 }
 input.buttonpayment {
-	min-width: 280px;
+	min-width: 290px;
 	margin-bottom: 15px;
 	background-image: none;
 	line-height: 24px;
 	padding: 8px;
 	background: none;
+	padding-left: 30px;
+	text-align: <?php echo $left; ?>;
 	border: 2px solid #666666;
 }
 input.buttonpaymentcb {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 4f95a35b009..16c1bb47129 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -345,12 +345,14 @@ input.buttongen {
 	vertical-align: middle;
 }
 input.buttonpayment {
-	min-width: 280px;
+	min-width: 290px;
 	margin-bottom: 15px;
 	background-image: none;
 	line-height: 24px;
 	padding: 8px;
 	background: none;
+	padding-left: 30px;
+	text-align: <?php echo $left; ?>;
 	border: 2px solid #666666;
 }
 input.buttonpaymentcb {

From 9edc8f6eb69f8e5c4aa4aa2b35d0ccb5ef2ef55d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Oct 2017 01:32:17 +0100
Subject: [PATCH 38/86] FIX Searching translation should not be case sensitive

---
 htdocs/admin/translation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 4965d6cf759..75448826654 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -437,8 +437,8 @@ if ($mode == 'searchkey')
         // Now search into translation array
         foreach($newlang->tab_translate as $key => $val)
         {
-            if ($transkey && ! preg_match('/'.preg_quote($transkey).'/', $key)) continue;
-            if ($transvalue && ! preg_match('/'.preg_quote($transvalue).'/', $val)) continue;
+            if ($transkey && ! preg_match('/'.preg_quote($transkey).'/i', $key)) continue;
+            if ($transvalue && ! preg_match('/'.preg_quote($transvalue).'/i', $val)) continue;
             $recordtoshow[$key]=$val;
         }
     }

From b11727885e25f31a4a80df8b817cde58adab2f53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Oct 2017 01:44:18 +0100
Subject: [PATCH 39/86] Translation

---
 htdocs/langs/en_US/admin.lang  | 4 ++--
 htdocs/langs/en_US/stripe.lang | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e3e96b0c735..f91231f4296 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -598,11 +598,11 @@ Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
 Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50100Name=Point of sales
 Module50100Desc=Point of sales module (POS).
 Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
+Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers)
 Module54000Name=PrintIPP
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 5efd2a45400..cb49994ea14 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe module setup
-StripeDesc=This module offer pages to allow payment on <a href="http://www.stripe.com" target="_blank">Stripe</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via <a href="http://www.stripe.com" target="_blank">Stripe</a>. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...)
 StripeOrCBDoPayment=Pay with credit card or Stripe
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Payment form

From 007783cf76a10e9925d869ea1e339a9d1992ccd2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Oct 2017 01:32:17 +0100
Subject: [PATCH 40/86] FIX Searching translation should not be case sensitive

---
 htdocs/admin/translation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 7e0468107df..51a7d32522e 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -372,8 +372,8 @@ if ($mode == 'searchkey')
         // Now search into translation array
         foreach($newlang->tab_translate as $key => $val)
         {
-            if ($transkey && ! preg_match('/'.preg_quote($transkey).'/', $key)) continue;
-            if ($transvalue && ! preg_match('/'.preg_quote($transvalue).'/', $val)) continue;
+            if ($transkey && ! preg_match('/'.preg_quote($transkey).'/i', $key)) continue;
+            if ($transvalue && ! preg_match('/'.preg_quote($transvalue).'/i', $val)) continue;
             $recordtoshow[$key]=$val;
         }
     }

From 39506df4dd047d0ae77d9cf5ac6c88577f20a1a2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Oct 2017 02:33:54 +0100
Subject: [PATCH 41/86] Add business_vat_id in stripe payment

---
 htdocs/public/payment/newpayment.php | 14 +++++++++++---
 htdocs/public/stripe/newpayment.php  | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 2b456e2d486..f5fb86c8bfa 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -372,6 +372,7 @@ if ($action == 'dopayment')
 }
 
 
+// Called when choosing Stripe mode, after the 'dopayment'
 if ($action == 'charge')
 {
 	// Correct the amount according to unit of currency
@@ -384,20 +385,24 @@ if ($action == 'charge')
 
 	$stripeToken = GETPOST("stripeToken",'alpha');
 	$email = GETPOST("stripeEmail",'alpha');
+	$vatnumber = GETPOST('vatnumber','alpha');
 
 	dol_syslog("stripeToken = ".$stripeToken, LOG_DEBUG, 0, '_stripe');
-	dol_syslog("stripeEmail = ".$stripeEmail, LOG_DEBUG, 0, '_stripe');
+	dol_syslog("email = ".$email, LOG_DEBUG, 0, '_stripe');
+	dol_syslog("vatnumber = ".$vatnumber, LOG_DEBUG, 0, '_stripe');
 
 	$error = 0;
 
 	try {
-		dol_syslog("Create customer", LOG_DEBUG, 0, '_stripe');
+		dol_syslog("Create customer card profile", LOG_DEBUG, 0, '_stripe');
 		$customer = \Stripe\Customer::create(array(
 		'email' => $email,
-		'description' => ($email?'Customer for '.$email:null),
+		'description' => ($email?'Customer card profile for '.$email:null),
 		'metadata' => array('ipaddress'=>$_SERVER['REMOTE_ADDR']),
+		'business_vat_id' => ($vatnumber?$vatnumber:null),
 		'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
 		));
+		// Return $customer = array('id'=>'cus_XXXX', ...)
 		// TODO Add 'business_vat_id' ?
 
 		dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
@@ -773,6 +778,7 @@ if ($source == 'order')
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="vatnumber" value="'.$order->thirdparty->tva_intra.'">'."\n";
 	$labeldesc=$langs->trans("Order").' '.$order->ref;
 	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
@@ -899,6 +905,7 @@ if ($source == 'invoice')
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="vatnumber" value="'.$invoice->thirdparty->tva_intra.'">'."\n";
 	$labeldesc=$langs->trans("Invoice").' '.$invoice->ref;
 	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
@@ -1105,6 +1112,7 @@ if ($source == 'contractline')
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="vatnumber" value="'.$contract->thirdparty->tva_intra.'">'."\n";
 	$labeldesc=$langs->trans("Contract").' '.$contract->ref;
 	if (GETPOST('desc','alpha')) $labeldesc=GETPOST('desc','alpha');
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 03198ec8be6..5fd3924644e 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -16,6 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Page is called with payment parameters then called with action='dopayment', then called with action='charge' then redirect is done on urlok/jo
  */
 
 /**
@@ -216,19 +218,22 @@ if ($action == 'charge')
 
     $stripeToken = GETPOST("stripeToken",'alpha');
     $email = GETPOST("stripeEmail",'alpha');
+    $vatnumber = GETPOST('vatnumber','alpha');
 
     dol_syslog("stripeToken = ".$stripeToken, LOG_DEBUG, 0, '_stripe');
-    dol_syslog("stripeEmail = ".$stripeEmail, LOG_DEBUG, 0, '_stripe');
+    dol_syslog("email = ".$email, LOG_DEBUG, 0, '_stripe');
+    dol_syslog("vatnumber = ".$vatnumber, LOG_DEBUG, 0, '_stripe');
 
     $error = 0;
 
     try {
-        dol_syslog("Create customer", LOG_DEBUG, 0, '_stripe');
+        dol_syslog("Create customer card profile", LOG_DEBUG, 0, '_stripe');
         $customer = \Stripe\Customer::create(array(
             'email' => $email,
-            'description' => ($email?'Customer for '.$email:null),
+            'description' => ($email?'Customer card profile for '.$email:null),
             'metadata' => array('ipaddress'=>$_SERVER['REMOTE_ADDR']),
-            'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
+			'business_vat_id' => ($vatnumber?$vatnumber:null),
+        	'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
         ));
         // TODO Add 'business_vat_id' ?
 
@@ -577,6 +582,7 @@ if (GETPOST("source") == 'order')
         print '<!-- Shipping address not complete, so we don t use it -->'."\n";
     }
     print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="vatnumber" value="'.$order->thirdparty->tva_intra.'">'."\n";
     print '<input type="hidden" name="desc" value="'.$langs->trans("Order").' '.$order->ref.'">'."\n";
 }
 
@@ -687,6 +693,7 @@ if (GETPOST("source") == 'invoice')
         print '<!-- Shipping address not complete, so we don t use it -->'."\n";
     }
     print '<input type="hidden" name="email" value="'.$invoice->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="vatnumber" value="'.$invoice->thirdparty->tva_intra.'">'."\n";
     print '<input type="hidden" name="desc" value="'.$langs->trans("Invoice").' '.$invoice->ref.'">'."\n";
 }
 
@@ -886,6 +893,7 @@ if (GETPOST("source") == 'contractline')
         print '<!-- Shipping address not complete, so we don t use it -->'."\n";
     }
     print '<input type="hidden" name="email" value="'.$contract->thirdparty->email.'">'."\n";
+    print '<input type="hidden" name="vatnumber" value="'.$contract->thirdparty->tva_intra.'">'."\n";
     print '<input type="hidden" name="desc" value="'.$langs->trans("Contract").' '.$contract->ref.'">'."\n";
 }
 

From b74399abf62ac3803b360767b5af4fb6fabb57ff Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Oct 2017 02:46:19 +0100
Subject: [PATCH 42/86] Code comment

---
 htdocs/public/payment/newpayment.php | 2 +-
 htdocs/public/stripe/newpayment.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index f5fb86c8bfa..977c65d49a7 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -403,7 +403,6 @@ if ($action == 'charge')
 		'source'  => $stripeToken           // source can be a token OR array('object'=>'card', 'exp_month'=>xx, 'exp_year'=>xxxx, 'number'=>xxxxxxx, 'cvc'=>xxx, 'name'=>'Cardholder's full name', zip ?)
 		));
 		// Return $customer = array('id'=>'cus_XXXX', ...)
-		// TODO Add 'business_vat_id' ?
 
 		dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
 		$charge = \Stripe\Charge::create(array(
@@ -414,6 +413,7 @@ if ($action == 'charge')
 		'metadata' => array("FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name),
 		'statement_descriptor' => dol_trunc(dol_trunc(dol_string_unaccent($mysoc->name), 6, 'right', 'UTF-8', 1).' '.$FULLTAG, 22, 'right', 'UTF-8', 1)     // 22 chars that appears on bank receipt
 		));
+		// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
 	} catch(\Stripe\Error\Card $e) {
 		// Since it's a decline, \Stripe\Error\Card will be caught
 		$body = $e->getJsonBody();
diff --git a/htdocs/public/stripe/newpayment.php b/htdocs/public/stripe/newpayment.php
index 5fd3924644e..35ccba4ef1c 100644
--- a/htdocs/public/stripe/newpayment.php
+++ b/htdocs/public/stripe/newpayment.php
@@ -239,7 +239,7 @@ if ($action == 'charge')
 
         dol_syslog("Create charge", LOG_DEBUG, 0, '_stripe');
         $charge = \Stripe\Charge::create(array(
-            'customer' => $customer->id,
+            'customer' => $customer->id,				// Will reuse default source of this customer card profile
             'amount'   => price2num($amount, 'MU'),
             'currency' => $currency,
             'description' => 'Stripe payment: '.$FULLTAG,

From 08f931b73c7b0cbdd8fd065ac41fbc65c5e42a82 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Mon, 30 Oct 2017 12:39:06 +0100
Subject: [PATCH 43/86] Only show show lot from same src warehouse.

When shipping from multiple warehouse, only allow lot from same src
warehouse. (expeditiondet_batch is on to many from expeditiondet).
---
 htdocs/expedition/card.php                   | 23 ++++--
 htdocs/expedition/class/expedition.class.php | 76 ++++++++++++++++----
 2 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 838e34e44d0..52c780e1680 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -684,16 +684,21 @@ if (empty($reshook))
 						$batch="batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
 						$qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
 						$batch_id = GETPOST($batch,'int');
-						if (! empty($batch_id) && $batch_id != $detail_batch->fk_origin_stock)
+						$batch_qty = GETPOST($qty, 'int');
+						if (! empty($batch_id) && ($batch_id != $detail_batch->fk_origin_stock || $batch_qty != $detail_batch->dluo_qty))
 						{
-							if ($lotStock->fetch($batch_id) > 0) 
+							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0) 
 							{
-								$line->id = $detail_batch->fk_expeditiondet;
+								if ($lines[$i]->entrepot_id != 0)
+								{
+									// allow update line entrepot_id if not multi warehouse shipping
+									$line->entrepot_id = $lotStock->warehouseid;
+								}
 								$line->detail_batch->fk_origin_stock = $batch_id;
 								$line->detail_batch->batch = $lotStock->batch;
 								$line->detail_batch->id = $detail_batch->id;
-								$line->entrepot_id = $lotStock->warehouseid;
-								$line->qty = GETPOST($qty, 'int');
+								$line->detail_batch->entrepot_id = $lotStock->warehouseid;
+								$line->detail_batch->dluo_qty = $batch_qty;
 								if ($line->update($user) < 0) {
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
@@ -2157,13 +2162,19 @@ else if ($id || $ref)
 				print '<td colspan="'.$editColspan.'"><table>';
 				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
 				{
+					$line = new ExpeditionLigne($db);
 					foreach ($lines[$i]->detail_batch as $detail_batch) 
 					{
 						print '<tr>';
 						// Qty to ship or shipped
 						print '<td>' . '<input name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->dluo_qty.'">' . '</td>';
 						// Batch number managment
-						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product). '</td>';
+						if ($lines[$i]->entrepot_id == 0)
+						{
+							// only show lot numbers from src warehouse when shipping from multiple warehouses
+							$line->fetch($detail_batch->fk_expeditiondet);
+						}
+						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $line->entrepot_id). '</td>';
 						print '</tr>';
 					}
 				}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 87581cea1ac..ecd56ed9d70 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2278,6 +2278,40 @@ class ExpeditionLigne extends CommonObjectLine
 		$this->db=$db;
 	}
 
+	/**
+	 *  Load line expedition
+	 *
+	 *  @param  int		$rowid          Id line order
+	 *  @return	int						<0 if KO, >0 if OK
+	 */
+	function fetch($rowid)
+	{
+		$sql = 'SELECT ed.rowid, ed.fk_expedition, ed.fk_entrepot, ed.fk_origin_line, ed.qty, ed.rang';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as ed';
+		$sql.= ' WHERE ed.rowid = '.$rowid;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$objp = $this->db->fetch_object($result);
+			$this->id				= $objp->rowid;
+			$this->fk_expedition	= $objp->fk_expedition;
+			$this->entrepot_id		= $objp->fk_entrepot;
+			$this->fk_origin_line	= $objp->fk_origin_line;
+			$this->qty				= $objp->qty;
+			$this->rang				= $objp->rang;
+
+			$this->db->free($result);
+
+			return 1;
+		}
+		else
+		{
+			$this->errors[] = $this->db->lasterror();
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
 	/**
 	 *	Insert line into database
 	 *
@@ -2451,14 +2485,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 		dol_syslog(get_class($this)."::update id=$this->id, entrepot_id=$this->entrepot_id, product_id=$this->fk_product, qty=$this->qty");
 
-		// check parameters
-		if (! isset($this->id) || ! isset($this->entrepot_id))
-		{
-			dol_syslog(get_class($this).'::update missing line id and/or warehouse id', LOG_ERR);
-			$this->errors[]='ErrorMandatoryParametersNotProvided';
-			$error++;
-			return -1;
-		}
+		
 
 		$this->db->begin();
 
@@ -2482,13 +2509,36 @@ class ExpeditionLigne extends CommonObjectLine
 				$batch = $this->detail_batch[0]->batch;
 				$batch_id = $this->detail_batch[0]->fk_origin_stock;
 				$expedition_batch_id = $this->detail_batch[0]->id;
+				if ($this->entrepot_id != $this->detail_batch[0]->entrepot_id)
+				{
+					dol_syslog(get_class($this).'::update only possible for batch of same warehouse', LOG_ERR);
+					$this->errors[]='ErrorBadParameters';
+					$error++;
+				}
+				$qty = price2num($this->detail_batch[0]->dluo_qty);
 			}
 		}
-		else
+		else if (! empty($this->detail_batch))
 		{
 			$batch = $this->detail_batch->batch;
 			$batch_id = $this->detail_batch->fk_origin_stock;
 			$expedition_batch_id = $this->detail_batch->id;
+			if ($this->entrepot_id != $this->detail_batch->entrepot_id)
+			{
+				dol_syslog(get_class($this).'::update only possible for batch of same warehouse', LOG_ERR);
+				$this->errors[]='ErrorBadParameters';
+				$error++;
+			}
+			$qty = price2num($this->detail_batch->dluo_qty);
+		}
+
+		// check parameters
+		if (! isset($this->id) || ! isset($this->entrepot_id))
+		{
+			dol_syslog(get_class($this).'::update missing line id and/or warehouse id', LOG_ERR);
+			$this->errors[]='ErrorMandatoryParametersNotProvided';
+			$error++;
+			return -1;
 		}
 
 		// update lot
@@ -2512,6 +2562,7 @@ class ExpeditionLigne extends CommonObjectLine
 			}
 			else 
 			{
+				// caculate new total line qty
 				foreach ($lotArray as $lot) 
 				{
 					if ($expedition_batch_id != $lot->id) 
@@ -2519,6 +2570,7 @@ class ExpeditionLigne extends CommonObjectLine
 						$remainingQty += $lot->dluo_qty;
 					}
 				}
+				$qty += $remainingQty;
 				
 				//fetch lot details
 				
@@ -2550,8 +2602,8 @@ class ExpeditionLigne extends CommonObjectLine
 							$shipmentLot->batch = $lot->batch;
 							$shipmentLot->eatby = $lot->eatby;
 							$shipmentLot->sellby = $lot->sellby;
-							$shipmentLot->entrepot_id = $this->entrepot_id;
-							$shipmentLot->dluo_qty = $qty;
+							$shipmentLot->entrepot_id = $this->detail_batch->entrepot_id;
+							$shipmentLot->dluo_qty = $this->detail_batch->dluo_qty;
 							$shipmentLot->fk_origin_stock = $batch_id;
 							if ($shipmentLot->create($this->id) < 0) 
 							{
@@ -2568,7 +2620,7 @@ class ExpeditionLigne extends CommonObjectLine
 			// update line
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 			$sql.= " fk_entrepot = ".$this->entrepot_id;
-			$sql.= " , qty = ".($qty + $remainingQty);
+			$sql.= " , qty = ".$qty;
 			$sql.= " WHERE rowid = ".$this->id;
 			
 			if (!$this->db->query($sql)) 

From 892798bf79fc477cdfade20c22d8858344c13996 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Oct 2017 12:40:12 +0100
Subject: [PATCH 44/86] Code comment

---
 htdocs/api/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index d34a97ed298..a0e8d337f5d 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -139,14 +139,14 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' |
                 {
                     $module = strtolower($regmod[1]);
                     $moduledirforclass = getModuleDirForApiClass($module);
-                    $moduleforperm = $module;
-                    if ($module == 'propale') { $moduleforperm='propal'; }
+                    $modulenameforenabled = $module;
+                    if ($module == 'propale') { $moduleforenabled='propal'; }
 
                     //dol_syslog("Found module file ".$file." - module=".$module." - moduledirforclass=".$moduledirforclass);
 
                     // Defined if module is enabled
                     $enabled=true;
-                    if (empty($conf->$moduleforperm->enabled)) $enabled=false;
+                    if (empty($conf->$moduleforenabled->enabled)) $enabled=false;
 
                     if ($enabled)
                     {

From f904c46a103d32057e220bab61e44c6a13d5c6e6 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 30 Oct 2017 14:22:34 +0100
Subject: [PATCH 45/86] Warning: trim() expects parameter 1 to be string, array
 given in /httpdocs/core/lib/functions.lib.php on line 520

---
 htdocs/core/lib/functions.lib.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 85ea597644d..a376661829c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -517,6 +517,8 @@ function GETPOST($paramname, $check='alpha', $method=0, $filter=NULL, $options=N
 			if (preg_match('/[^0-9,]+/i',$out)) $out='';
 			break;
 		case 'alpha':
+			if (!is_string($out))
+			return $out;
 			$out=trim($out);
 			// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 			// '../' is dangerous because it allows dir transversals

From b7c5844d355c42e3e4303109043aef427d27e082 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Oct 2017 17:40:34 +0100
Subject: [PATCH 46/86] Update template

---
 htdocs/modulebuilder/template/ChangeLog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/ChangeLog.md b/htdocs/modulebuilder/template/ChangeLog.md
index 28f0d04e47d..99f4f673c0c 100644
--- a/htdocs/modulebuilder/template/ChangeLog.md
+++ b/htdocs/modulebuilder/template/ChangeLog.md
@@ -1,4 +1,4 @@
-# CHANGELOG MYMODULE FOR DOLIBARR ERP CRM
+# CHANGELOG MYMODULE FOR <a href="https://www.dolibarr.org">DOLIBARR ERP CRM</a>
 
 ## 1.0
 Initial version

From 2b966e630b328df1641aeca03e9adb0b6fda68e8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 30 Oct 2017 19:49:48 +0100
Subject: [PATCH 47/86] Doc

---
 ChangeLog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e0a334a9c84..e0c9ad462a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,8 +18,7 @@ FIX: API to get object does not return data of linked objects
 FIX: Bad localtax apply
 FIX: Bad ressource list in popup in gantt view
 FIX: bankentries search conciliated if val 0
-FIX: hook formObjectOptions() must use $expe and not $object which i…
-FIX: hook formObjectOptions() must use $expe and not $object which is an order here
+FIX: hook formObjectOptions() must use $expe and not $object
 FIX: make of link to other object during creation
 FIX: Missing function getLinesArray
 FIX: old batch not shown in multi shipping

From 3db101ffdda18d203133f0321b399858bd1de938 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 01:06:07 +0100
Subject: [PATCH 48/86] Clean packager

---
 build/makepack-dolibarr.pl                    |  4 +
 htdocs/includes/stripe/build.php              |  0
 htdocs/modulebuilder/template/.gitattributes  |  2 +-
 .../template/dev/dolistore/README.md          | 87 -------------------
 .../template/dev/dolistore/keywords-de.txt    |  0
 .../template/dev/dolistore/keywords-en.txt    |  0
 .../template/dev/dolistore/keywords-es.txt    |  0
 .../template/dev/dolistore/keywords-fr.txt    |  0
 .../template/dev/dolistore/keywords-it.txt    |  0
 .../template/dev/dolistore/long_desc-de.html  |  0
 .../template/dev/dolistore/long_desc-en.html  |  0
 .../template/dev/dolistore/long_desc-es.html  |  0
 .../template/dev/dolistore/long_desc-fr.html  |  0
 .../template/dev/dolistore/long_desc-it.html  |  0
 .../template/dev/dolistore/name-de.txt        |  1 -
 .../template/dev/dolistore/name-en.txt        |  1 -
 .../template/dev/dolistore/name-es.txt        |  1 -
 .../template/dev/dolistore/name-fr.txt        |  1 -
 .../template/dev/dolistore/name-it.txt        |  1 -
 .../template/dev/dolistore/short_desc-de.html |  0
 .../template/dev/dolistore/short_desc-en.html |  0
 .../template/dev/dolistore/short_desc-es.html |  0
 .../template/dev/dolistore/short_desc-fr.html |  0
 .../template/dev/dolistore/short_desc-it.html |  0
 .../template/dev/git-hooks/post-commit        |  0
 .../template/dev/git-hooks/pre-commit         |  0
 .../template/dev/git-hooks/pre-push           |  0
 .../modulebuilder/template/dev/newmodule.sh   | 68 ---------------
 .../template/scripts/myobject.php             |  0
 29 files changed, 5 insertions(+), 161 deletions(-)
 mode change 100644 => 100755 htdocs/includes/stripe/build.php
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/README.md
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-de.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-en.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-es.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/name-it.txt
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
 delete mode 100644 htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
 mode change 100644 => 100755 htdocs/modulebuilder/template/dev/git-hooks/post-commit
 mode change 100644 => 100755 htdocs/modulebuilder/template/dev/git-hooks/pre-commit
 mode change 100644 => 100755 htdocs/modulebuilder/template/dev/git-hooks/pre-push
 delete mode 100644 htdocs/modulebuilder/template/dev/newmodule.sh
 mode change 100644 => 100755 htdocs/modulebuilder/template/scripts/myobject.php

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index e0fa89d924d..2802e55c702 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -571,6 +571,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/.gitmodules`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/parsedown/LICENSE.txt`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/.gitattributes`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Classes/license.md`;
@@ -579,6 +580,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/Examples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/unitTests`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpoffice/phpexcel/license.md`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/ae_fonts_*`;
@@ -590,6 +592,8 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
+        
         
         print "Remove subdir of custom dir\n";
    	    print "find $BUILDROOT/$PROJECT/htdocs/custom/* -type d -exec rm -fr {} \\;\n";
diff --git a/htdocs/includes/stripe/build.php b/htdocs/includes/stripe/build.php
old mode 100644
new mode 100755
diff --git a/htdocs/modulebuilder/template/.gitattributes b/htdocs/modulebuilder/template/.gitattributes
index 58065c729fc..0d2c67e38e6 100644
--- a/htdocs/modulebuilder/template/.gitattributes
+++ b/htdocs/modulebuilder/template/.gitattributes
@@ -13,7 +13,7 @@
 *.lang text eol=lf
 *.txt text eol=lf
 *.md text eol=lf
-*.bat text eol=crlf
+*.bat text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.ico binary
diff --git a/htdocs/modulebuilder/template/dev/dolistore/README.md b/htdocs/modulebuilder/template/dev/dolistore/README.md
deleted file mode 100644
index d322d2c98fe..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-Dolistore
-=========
-
-[Dolistore](https://dolistore.com) is the marketplace for Dolibarr modules.
-
-This directory contains templates assets that may be useful for publication.
-
-Images
-------
-
-### Logo
-
-See [img folder README](../img/README.md).
-
-### Screenshots
-
-Texts
------
-
-All texts needs 5 languages versions for:
-- en (English)
-- fr (Français)
-- es (Español)
-- it (Italiano)
-- de (Deutsch)
-
-### Name
-
-The module's marketed name.
-
-### Price
-
-Expressed in Euro (€).  
-Keep in mind that Dolistore will keep a 20% markup.
-
-### Categories
-
-- [x] Modules/Plugins
-- [ ] Skins and Templates
-- [ ] Tools and documentation
-- [ ] Skins
-- [ ] Document templates
-- [ ] System tools
-- [ ] CRM
-- [ ] ECM
-- [ ] Human Relationship
-- [ ] Products, Services or Stock
-- [ ] Project or collaborative
-- [ ] Interfaces
-- [ ] Other
-- [ ] Reporting or search
-- [ ] User's interface
-- [ ] 2Report sub-modules
-- [ ] Accountancy
-
-*The list may change. Check [Dolistore](https://dolistore.com) for up-to-date information.*
-
-### Short description
-
-A short description of the modules main features.  
-400 characters max.
-
-### Keywords
-
-Comma separated lists.
-eg: ```template,dev,module```
-
-### Long description
-
-The long description of your module.
-
-Suggested technical data:
-
-Version: 1.0.0  
-Publisher: MyCompany  
-Licence: GPLv3+  
-User interface language(s): English  
-Help/Support: None / Forum www.dolibarr.org / Mail at contact@example.com  
-Prerequisites:
-- Dolibarr min version: 3.8
-- Dolibarr max version: 3.9.*
-- PHP: ≥5.3  
-Install:
-- Download the module's archive file (.zip file) from DoliStore.com.
-- Put the file into the custom directory of Dolibarr.
-- Uncompress the zip file, for example with ```unzip modulefile_version.zip``` command.
-- Module is then available and can be activated.  
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-de.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-en.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-es.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-fr.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt b/htdocs/modulebuilder/template/dev/dolistore/keywords-it.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-de.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-en.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-es.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-fr.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html b/htdocs/modulebuilder/template/dev/dolistore/long_desc-it.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-de.txt b/htdocs/modulebuilder/template/dev/dolistore/name-de.txt
deleted file mode 100644
index d177fbf2ba9..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-de.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mein modul
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-en.txt b/htdocs/modulebuilder/template/dev/dolistore/name-en.txt
deleted file mode 100644
index bf608d557d4..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-en.txt
+++ /dev/null
@@ -1 +0,0 @@
-My module
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-es.txt b/htdocs/modulebuilder/template/dev/dolistore/name-es.txt
deleted file mode 100644
index a0ec54ad842..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-es.txt
+++ /dev/null
@@ -1 +0,0 @@
-My módulo
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt b/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
deleted file mode 100644
index 310ebcf10a5..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-fr.txt
+++ /dev/null
@@ -1 +0,0 @@
-Mon module
diff --git a/htdocs/modulebuilder/template/dev/dolistore/name-it.txt b/htdocs/modulebuilder/template/dev/dolistore/name-it.txt
deleted file mode 100644
index a196c1511a1..00000000000
--- a/htdocs/modulebuilder/template/dev/dolistore/name-it.txt
+++ /dev/null
@@ -1 +0,0 @@
-Il mio modulo
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-de.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-en.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-es.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-fr.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html b/htdocs/modulebuilder/template/dev/dolistore/short_desc-it.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/post-commit b/htdocs/modulebuilder/template/dev/git-hooks/post-commit
old mode 100644
new mode 100755
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/pre-commit b/htdocs/modulebuilder/template/dev/git-hooks/pre-commit
old mode 100644
new mode 100755
diff --git a/htdocs/modulebuilder/template/dev/git-hooks/pre-push b/htdocs/modulebuilder/template/dev/git-hooks/pre-push
old mode 100644
new mode 100755
diff --git a/htdocs/modulebuilder/template/dev/newmodule.sh b/htdocs/modulebuilder/template/dev/newmodule.sh
deleted file mode 100644
index 92f4875cbf6..00000000000
--- a/htdocs/modulebuilder/template/dev/newmodule.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2014 Raphaël Doursenaud
-#
-# 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/>.
-
-VERSION=0.0.1
-USAGE="Usage: newmodule.sh NewName"
-
-# TODO: check depedencies presence (find, sed and rename)
-# TODO: allow execution from build directory
-# TODO: validate parameter
-# TODO: use multiple word parameter, for example "My module is awesome" which should lead to "MyModuleIsAwesome" and "mymoduleisawesome" so we can also fix language strings
-# TODO: add module ID management (language files…)
-# TODO: add oneliner description management
-# TODO: add copyright management
-
-if [ $# == 0 ] ; then
-    echo ${USAGE}
-    exit 1;
-fi
-
-ToLower () {
-	echo $(echo $1 | tr '[:upper:]' '[:lower:]')
-}
-ToUpper () {
-	echo $(echo $1 | tr '[:lower:]' '[:upper:]')
-}
-
-CAMELORIG="MyModule"
-LOWERORIG=$(ToLower ${CAMELORIG})
-UPPERORIG=$(ToUpper ${CAMELORIG})
-cameltarget=$(echo $1)
-lowertarget=$(ToLower $1)
-uppertarget=$(ToUpper $1)
-thisscript=`basename $0`
-
-# Rewrite occurences
-find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${CAMELORIG}/${cameltarget}/g"
-find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${LOWERORIG}/${lowertarget}/g"
-find . -not -iwholename '*.git*' -not -name "${thisscript}" -type f -print0 | xargs -0 sed -i'' -e"s/${UPPERORIG}/${uppertarget}/g"
-
-# Rename files
-for file in $(find . -not -iwholename '*.git*' -name "*${CAMELORIG}*" -type f)
-do
-	rename ${CAMELORIG} ${cameltarget} ${file}
-done
-for file in $(find . -not -iwholename '*.git*' -name "*${LOWERORIG}*" -type f)
-do
-	rename ${LOWERORIG} ${lowertarget} ${file}
-done
-for file in $(find . -not -iwholename '*.git*' -name "*${UPPERORIG}*" -type f)
-do
-	rename ${UPPERORIG} ${uppertarget} ${file}
-done
-
-# TODO: add instructions about renaming vars (ack --php -i my)
-# TODO: add instructions about renaming files (ls -R|grep -i my)
diff --git a/htdocs/modulebuilder/template/scripts/myobject.php b/htdocs/modulebuilder/template/scripts/myobject.php
old mode 100644
new mode 100755

From 32303d30fa8ae592d49260a9f084b206c696c7c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 10:46:23 +0100
Subject: [PATCH 49/86] Fix search on special char in module list

---
 htdocs/core/modules/DolibarrModules.class.php | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index d7258f0117c..32240f778d2 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -553,10 +553,10 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 		global $langs;
 		$langs->load("admin");
 
-		if ($langs->trans("Module".$this->numero."Name") != ("Module".$this->numero."Name"))
+		if ($langs->transnoentitiesnoconv("Module".$this->numero."Name") != ("Module".$this->numero."Name"))
 		{
 			// If module name translation exists
-			return $langs->trans("Module".$this->numero."Name");
+			return $langs->transnoentitiesnoconv("Module".$this->numero."Name");
 		}
 		else
 		{
@@ -572,11 +572,11 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 			if ($langs->trans("Module".$this->name."Name") != ("Module".$this->name."Name"))
 			{
 				// If module name translation exists
-				return $langs->trans("Module".$this->name."Name");
+				return $langs->transnoentitiesnoconv("Module".$this->name."Name");
 			}
 
 			// Last chance with simple label
-			return $langs->trans($this->name);
+			return $langs->transnoentitiesnoconv($this->name);
 		}
 	}
 
@@ -591,10 +591,10 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 		global $langs;
 		$langs->load("admin");
 
-		if ($langs->trans("Module".$this->numero."Desc") != ("Module".$this->numero."Desc"))
+		if ($langs->transnoentitiesnoconv("Module".$this->numero."Desc") != ("Module".$this->numero."Desc"))
 		{
 			// If module description translation exists
-			return $langs->trans("Module".$this->numero."Desc");
+			return $langs->transnoentitiesnoconv("Module".$this->numero."Desc");
 		}
 		else
 		{
@@ -607,7 +607,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 				}
 			}
 
-			if ($langs->trans("Module".$this->name."Desc") != ("Module".$this->name."Desc"))
+			if ($langs->transnoentitiesnoconv("Module".$this->name."Desc") != ("Module".$this->name."Desc"))
 			{
 				// If module name translation exists
 				return $langs->trans("Module".$this->name."Desc");
@@ -665,7 +665,7 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 					}
 				}
 
-				$content = $langs->trans($this->descriptionlong);
+				$content = $langs->transnoentitiesnoconv($this->descriptionlong);
 			}
 		}
 
@@ -797,13 +797,13 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 		$ret='';
 
 		$newversion=preg_replace('/_deprecated/','',$this->version);
-		if ($newversion == 'experimental') $ret=($translated?$langs->trans("VersionExperimental"):$newversion);
-		elseif ($newversion == 'development') $ret=($translated?$langs->trans("VersionDevelopment"):$newversion);
+		if ($newversion == 'experimental') $ret=($translated?$langs->transnoentitiesnoconv("VersionExperimental"):$newversion);
+		elseif ($newversion == 'development') $ret=($translated?$langs->transnoentitiesnoconv("VersionDevelopment"):$newversion);
 		elseif ($newversion == 'dolibarr') $ret=DOL_VERSION;
 		elseif ($newversion) $ret=$newversion;
-		else $ret=($translated?$langs->trans("VersionUnknown"):'unknown');
+		else $ret=($translated?$langs->transnoentitiesnoconv("VersionUnknown"):'unknown');
 
-		if (preg_match('/_deprecated/',$this->version)) $ret.=($translated?' ('.$langs->trans("Deprecated").')':$this->version);
+		if (preg_match('/_deprecated/',$this->version)) $ret.=($translated?' ('.$langs->transnoentitiesnoconv("Deprecated").')':$this->version);
 		return $ret;
 	}
 
@@ -874,12 +874,12 @@ class DolibarrModules           // Can not be abstract, because we need to insta
 		if ($langs->trans($langstring) == $langstring)
 		{
 			// Translation not found
-			return $langs->trans($this->import_label[$r]);
+			return $langs->transnoentitiesnoconv($this->import_label[$r]);
 		}
 		else
 		{
 			// Translation found
-			return $langs->trans($langstring);
+			return $langs->transnoentitiesnoconv($langstring);
 		}
 	}
 

From 068f5e32cb0a98907cf788f039c7dbeee42dba29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 11:17:44 +0100
Subject: [PATCH 50/86] NEW Tooltip for substitutions variables on tooltips on
 admin pages

---
 htdocs/admin/chequereceipts.php               |  4 ++--
 htdocs/admin/commande.php                     |  6 +++---
 htdocs/admin/contract.php                     |  8 +++-----
 htdocs/admin/expedition.php                   |  6 +++---
 htdocs/admin/expensereport.php                |  6 +++---
 htdocs/admin/facture.php                      |  6 +++---
 htdocs/admin/fichinter.php                    |  6 +++---
 htdocs/admin/livraison.php                    |  4 ++--
 htdocs/admin/propal.php                       |  6 +++---
 htdocs/admin/supplier_invoice.php             |  4 ++--
 htdocs/admin/supplier_order.php               |  4 ++--
 htdocs/admin/supplier_proposal.php            |  6 +++---
 htdocs/compta/facture/class/facture.class.php |  8 ++++++++
 htdocs/core/lib/functions.lib.php             |  3 +++
 htdocs/core/lib/pdf.lib.php                   | 17 +++++++++--------
 15 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 0a31b24b109..299d18d3b4f 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -258,14 +258,14 @@ $var=true;
 
 $var=! $var;
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
 $htmltext.='</i>';
 
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnChequeReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnChequeReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='BANK_CHEQUERECEIPT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 1c88073cf2b..09e904e3a5d 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -539,7 +539,7 @@ print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 $var=true;
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
@@ -550,7 +550,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_ORDER_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -573,7 +573,7 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_COMMANDE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftOrders"), $htmltext);
+print $form->textwithpicto($langs->trans("WatermarkOnDraftOrders"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ae8daea86e2..b83373b70c0 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -474,7 +474,7 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 $var=true;
 
-$substitutionarray=pdf_getSubstitutionArray($langs, array('objectamount'));
+$substitutionarray=pdf_getSubstitutionArray($langs, array('objectamount'), null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
@@ -482,8 +482,7 @@ $htmltext.='</i>';
 
 $var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
-//print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
-print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2);
+print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
 print '<br>';
 $variablename='CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
@@ -501,8 +500,7 @@ print '</td></tr>'."\n";
 //Use draft Watermark
 
 print '<tr class="oddeven"><td>';
-//print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
-print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2);
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index ba389c5207a..d623de33f31 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -477,14 +477,14 @@ print "<tr class=\"liste_titre\">";
 print "<td>".$langs->trans("Parameter")."</td>\n";
 print "</tr>";
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
 $htmltext.='</i>';
 
 print '<tr><td>';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnShippings"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnShippings"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='SHIPPING_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -499,7 +499,7 @@ else
 print "</td></tr>\n";
 
 print '<tr><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext).'<br>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '<input size="50" class="flat" type="text" name="SHIPPING_DRAFT_WATERMARK" value="'.$conf->global->SHIPPING_DRAFT_WATERMARK.'">';
 print "</td></tr>\n";
 
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 1dd5166e1cb..86fac86f532 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -482,7 +482,7 @@ print '<td align="center" width="60"></td>';
 print "</tr>\n";
 $var=true;
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
@@ -490,7 +490,7 @@ $htmltext.='</i>';
 
 $var=! $var;
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='EXPENSEREPORT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -507,7 +507,7 @@ print '</td></tr>'."\n";
 //Use draft Watermark
 
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htmltext).'<br>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '<input size="50" class="flat" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.$conf->global->EXPENSEREPORT_DRAFT_WATERMARK.'">';
 print '</td></tr>'."\n";
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 85ee8c09934..1f574175898 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -711,7 +711,7 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" /
 print "</td></tr>\n";
 print '</form>';
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
@@ -722,7 +722,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_INVOICE_FREE_TEXT" />';
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -744,7 +744,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
 print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />';
 print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext);
+print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td>';
 print '<td><input size="50" class="flat" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
 print '</td><td align="right">';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 04e002602bb..0ada37d2ffb 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -534,7 +534,7 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
@@ -544,7 +544,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_FICHINTER_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnInterventions"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnInterventions"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -567,7 +567,7 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_FICHINTER_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftInterventionCards"), $htmltext).'<br>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftInterventionCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
 print '<input size="50" class="flat" type="text" name="FICHINTER_DRAFT_WATERMARK" value="'.$conf->global->FICHINTER_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 24e2772ae0d..bff8d75069a 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -454,7 +454,7 @@ print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 $var=true;
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
@@ -465,7 +465,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_DELIVERY_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnDeliveryReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnDeliveryReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='DELIVERY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index b3434d0bd7a..8d09e81e142 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -545,7 +545,7 @@ print "</td></tr>\n";
 print '</form>';
 */
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
@@ -555,7 +555,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_PROPOSAL_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -577,7 +577,7 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext).'<br>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index d3ea8b9a63e..a0b8d9e2e4f 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -471,14 +471,14 @@ print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
 $htmltext.='</i>';
 
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='SUPPLIER_INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 6b99bb1c39c..a9dfe95a2c3 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -537,14 +537,14 @@ else
 }
 */
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
 $htmltext.='</i>';
 
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 44d8b2f3627..862b90e179f 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -500,7 +500,7 @@ print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
 print "<td>&nbsp;</td>\n";
 print "</tr>";
 
-$substitutionarray=pdf_getSubstitutionArray($langs);
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
@@ -511,7 +511,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_SUPPLIER_PROPOSAL_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnSupplierProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnSupplierProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename='SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
@@ -533,7 +533,7 @@ print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext).'<br>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
 print '<input size="50" class="flat" type="text" name="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK.'">';
 print '</td><td align="right">';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index fe5ebeaa57f..d53d90886d1 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -79,6 +79,8 @@ class Facture extends CommonInvoice
 	public $remise_percent;
 	public $total_ht=0;
 	public $total_tva=0;
+	public $total_localtax1=0;
+	public $total_localtax2=0;
 	public $total_ttc=0;
 	public $revenuestamp;
 
@@ -977,6 +979,8 @@ class Facture extends CommonInvoice
 			$line->subprice			= $object->lines[$i]->subprice;
 			$line->total_ht			= $object->lines[$i]->total_ht;
 			$line->total_tva		= $object->lines[$i]->total_tva;
+			$line->total_localtax1	= $object->lines[$i]->total_localtax1;
+			$line->total_localtax2	= $object->lines[$i]->total_localtax2;
 			$line->total_ttc		= $object->lines[$i]->total_ttc;
 			$line->vat_src_code  	= $object->lines[$i]->vat_src_code;
 			$line->tva_tx			= $object->lines[$i]->tva_tx;
@@ -1128,6 +1132,10 @@ class Facture extends CommonInvoice
                 $label.= '<br><b>' . $langs->trans('AmountHT') . ':</b> ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
             if (! empty($this->total_tva))
                 $label.= '<br><b>' . $langs->trans('VAT') . ':</b> ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+            if (! empty($this->total_tva))
+                $label.= '<br><b>' . $langs->trans('LT1') . ':</b> ' . price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
+            if (! empty($this->total_tva))
+                $label.= '<br><b>' . $langs->trans('LT2') . ':</b> ' . price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency);
             if (! empty($this->total_ttc))
                 $label.= '<br><b>' . $langs->trans('AmountTTC') . ':</b> ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
     		if ($this->type == self::TYPE_REPLACEMENT) $label=$langs->transnoentitiesnoconv("ShowInvoiceReplace").': '.$this->ref;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 85ea597644d..9fae31106fc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5472,6 +5472,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 		$substitutionarray['__AMOUNT__']          = is_object($object)?$object->total_ttc:'';
 		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object)?$object->total_ht:'';
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
+ 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object)?($object->total_localtax1?$object->total_localtax1:$object->total_localtax1):'';
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object)?($object->total_localtax2?$object->total_localtax2:$object->total_localtax2):'';
+
 		/* TODO Add key for multicurrency
     	$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object)?price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency_code):'';
 		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object)?price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency_code):'';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 99181d2c294..2f5a8961cd2 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -590,16 +590,17 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
 
 
 /**
- *   	Return array of possible substitutions for PDF content (without external module substitutions).
+ *	Return array of possible substitutions for PDF content (without external module substitutions).
  *
- *		@param	Translate	$outputlangs	Output language
- *      @param  array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
- *      @param  Object      $object         Object
- *      @return	array						Array of substitutions
+ *	@param	Translate	$outputlangs	Output language
+ *	@param	array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'object', 'date', 'user', ...)
+ *	@param	Object      $object         Object
+ *	@param	int         $onlykey        1=Do not calculate some heavy values of keys (performance enhancement when we need only the keys), 2=Values are truncated and html sanitized (to use for help tooltip)
+ *	@return	array						Array of substitutions
  */
-function pdf_getSubstitutionArray($outputlangs, $exclude=null, $object=null)
+function pdf_getSubstitutionArray($outputlangs, $exclude=null, $object=null, $onlykeys=0)
 {
-    $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $exclude, $object);
+    $substitutionarray = getCommonSubstitutionArray($outputlangs, $onlykeys, $exclude, $object);
     $substitutionarray['__FROM_NAME__']='__FROM_NAME__';
     $substitutionarray['__FROM_EMAIL__']='__FROM_EMAIL__';
     return $substitutionarray;
@@ -1822,7 +1823,7 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
 function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)
 {
 	if (empty($hookmanager)) global $hookmanager;
-	
+
 	$reshook=0;
     $result='';
     //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )

From 29bb0b37efd04958095a979f0453cf100339298b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 11:50:56 +0100
Subject: [PATCH 51/86] Translation

---
 htdocs/admin/defaultvalues.php | 8 ++------
 htdocs/admin/translation.php   | 2 ++
 htdocs/langs/en_US/other.lang  | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 6b98668b0d3..4dfc454807e 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -193,20 +193,16 @@ if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 {
     // Button off, click to enable
     $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=1'.$param.'">';
-    //$enabledisablehtml.= img_picto($langs->trans("Disabled"),'switch_off');
-    $enabledisablehtml.='<span class="fa fa-toggle-off valignmiddle" style="font-size: 2em; color: #999;" alt="'.$langs->trans("Disabled").'">';
+    $enabledisablehtml.= img_picto($langs->trans("Disabled"),'switch_off');
     if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("EnableDefaultValues");
-    $enabledisablehtml.='</span>';
     $enabledisablehtml.= '</a>';
 }
 else
 {
     // Button on, click to disable
     $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
-    //$enabledisablehtml.= img_picto($langs->trans("Activated"),'switch_on');
-    $enabledisablehtml.='<span class="fa fa-toggle-on valignmiddle" style="font-size: 2em; color: #227722;" alt="'.$langs->trans("Activated").'">';
+    $enabledisablehtml.= img_picto($langs->trans("Activated"),'switch_on');
     if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("DisableDefaultValues");
-    $enabledisablehtml.='</span>';
     $enabledisablehtml.= '</a>';
 }
 
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 75448826654..40486042df1 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -216,6 +216,7 @@ if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
     // Button off, click to enable
     $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1'.$param.'">';
     $enabledisablehtml.=img_picto($langs->trans("Disabled"),'switch_off');
+    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("EnableOverwriteTranslation");
     $enabledisablehtml.='</a>';
 }
 else
@@ -223,6 +224,7 @@ else
     // Button on, click to disable
     $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
     $enabledisablehtml.=img_picto($langs->trans("Activated"),'switch_on');
+    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("DisableOverwriteTranslation");
     $enabledisablehtml.='</a>';
 }
 
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index e1270533ae2..e8ef03d86fb 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -11,7 +11,7 @@ BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
 MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (tex) of invoice date
+TextMonthOfInvoice=Month (text) of invoice date
 PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date

From bd94ec0f1d24b6fbe2e8877a5d4de90b35c85b4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 12:25:06 +0100
Subject: [PATCH 52/86] Use fontawesome for picto for on/off default.

---
 htdocs/admin/defaultvalues.php    |  2 --
 htdocs/admin/translation.php      |  4 +---
 htdocs/core/lib/functions.lib.php | 19 ++++++++-----------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 4dfc454807e..e4ba112511e 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -194,7 +194,6 @@ if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
     // Button off, click to enable
     $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=1'.$param.'">';
     $enabledisablehtml.= img_picto($langs->trans("Disabled"),'switch_off');
-    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("EnableDefaultValues");
     $enabledisablehtml.= '</a>';
 }
 else
@@ -202,7 +201,6 @@ else
     // Button on, click to disable
     $enabledisablehtml.= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
     $enabledisablehtml.= img_picto($langs->trans("Activated"),'switch_on');
-    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("DisableDefaultValues");
     $enabledisablehtml.= '</a>';
 }
 
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 40486042df1..d467c23dd56 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -210,13 +210,12 @@ llxHeader('',$langs->trans("Setup"),$wikihelp);
 $param='&mode='.$mode;
 
 $enabledisablehtml='';
-if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.= $langs->trans("EnableOverwriteTranslation").' ';
+$enabledisablehtml.= $langs->trans("EnableOverwriteTranslation").' ';
 if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
 {
     // Button off, click to enable
     $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1'.$param.'">';
     $enabledisablehtml.=img_picto($langs->trans("Disabled"),'switch_off');
-    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("EnableOverwriteTranslation");
     $enabledisablehtml.='</a>';
 }
 else
@@ -224,7 +223,6 @@ else
     // Button on, click to disable
     $enabledisablehtml.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
     $enabledisablehtml.=img_picto($langs->trans("Activated"),'switch_on');
-    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("DisableOverwriteTranslation");
     $enabledisablehtml.='</a>';
 }
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 9fae31106fc..5df88160f6b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2721,19 +2721,16 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 	}
 	else
 	{
-		if ($picto == 'switch_off')
+		if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
 		{
+			$fakey = $picto; $facolor=''; $fasize='';
+			if ($picto == 'switch_off') { $fakey = 'fa-toggle-off'; $facolor='#999';    $fasize='2em'; }
+			if ($picto == 'switch_on')  { $fakey = 'fa-toggle-on';  $facolor='#227722'; $fasize='2em'; }
+			if ($picto == 'off') { $fakey = 'fa-square-o'; $fasize='1.3em'; }
+			if ($picto == 'on')  { $fakey = 'fa-check-square-o'; $fasize='1.3em'; }
 			$enabledisablehtml='';
-			$enabledisablehtml.='<span class="fa fa-toggle-off valignmiddle" style="font-size: 2em; color: #999;" alt="'.dol_escape_htmltag($titlealt).'">';
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("EnableOverwriteTranslation");
-			$enabledisablehtml.='</span>';
-			return $enabledisablehtml;
-		}
-		if ($picto == 'switch_on')
-		{
-			$enabledisablehtml='';
-			$enabledisablehtml.='<span class="fa fa-toggle-on valignmiddle" style="font-size: 2em; color: #227722;" alt="'.dol_escape_htmltag($titlealt).'">';
-			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$langs->trans("DisableOverwriteTranslation");
+			$enabledisablehtml.='<span class="fa '.$fakey.' valignmiddle" style="'.($fasize?('font-size: '.$fasize.';'):'').($facolor?(' color: '.$facolor.';'):'').'" alt="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'">';
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $enabledisablehtml.=$titlealt;
 			$enabledisablehtml.='</span>';
 			return $enabledisablehtml;
 		}

From d39a19e9766ac9f1eb93dccbaa2c20ef524a44e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 12:32:30 +0100
Subject: [PATCH 53/86] Replace on/off img tick with fa-font

---
 htdocs/core/lib/functions.lib.php |   1 +
 htdocs/theme/eldy/img/off.png     | Bin 568 -> 0 bytes
 htdocs/theme/eldy/img/on.png      | Bin 603 -> 0 bytes
 htdocs/theme/md/img/off.png       | Bin 248 -> 0 bytes
 htdocs/theme/md/img/on.png        | Bin 230 -> 0 bytes
 5 files changed, 1 insertion(+)
 delete mode 100644 htdocs/theme/eldy/img/off.png
 delete mode 100644 htdocs/theme/eldy/img/on.png
 delete mode 100644 htdocs/theme/md/img/off.png
 delete mode 100644 htdocs/theme/md/img/on.png

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5df88160f6b..45a5fa09838 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2721,6 +2721,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 	}
 	else
 	{
+		//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
 		if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
 		{
 			$fakey = $picto; $facolor=''; $fasize='';
diff --git a/htdocs/theme/eldy/img/off.png b/htdocs/theme/eldy/img/off.png
deleted file mode 100644
index f4217646b2645e16a1c83ccedb6755a8932a1e38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 568
zcmV-80>}M{P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00061Nkl<ZC{tyU
zOG_J37>4sdN=qp%#lNC1GzKrRLGcRWLXo&kFcqXEv8cEa#hq9|L}Jo9og|GRPSSQF
ziI_Ac={RQ0WFoyt*X8YZ4l`w}iwC~*o%cC6j^k%ro5Mov?R}VVyM3oKGm^ZppyvYt
zU7DTEQ7=GqkL_8z<dWv*bY*`Z&1@Dovdm$%a&Q32>upiy#T`-X?|0HJf7ECcnjqjR
z7K0jzKs`L<wbi4AL0K+4=ok;;0|PhbYip?P?xM22jW3&<(9$QkKF#o&^{P8NxL98Y
z<!^~6O!Ox`9u$H>6qlD#+Sq`emtmAHV3f<eE^lq|xnd}U<j@e4gG~HLAm{Z$_WNN}
zDyXH?P)|~*XELZJ5@^+`pvOXXex6B;0uv2$fHT^)sb1p4!~|->F_csa$<a|Xm2W7l
ztXLAm_$R*a>A|O^CFox(i1+nDn3{qxJq^+2LZeiI91io0DYlsSnGNWHAdZaS`cgr0
zbrr`Q9eCH?jy&C~QNKcba*}6E@tlb-ts}4%1)mQZ1?#yS>RAa5O@p|&2*K&JAN4g8
z9}z!TBRM#Tx82=%L$4gA`^Lf{><tei*44%5OzAiAjDG+s+}3I=!0vd|*@*}pm(@0j
zF?Q$6QNu%gw=eLY@QWC~_g78%De;PsiKfXJ5hkA7vws1x_~e)m9d(lc0000<MNUMn
GLSTZ7u?Cg^

diff --git a/htdocs/theme/eldy/img/on.png b/htdocs/theme/eldy/img/on.png
deleted file mode 100644
index 728bb3935366414766d184afb9cbc545e4ccebe1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0006aNkl<ZC{taM
z-%FEW6vuZLG(ipZA}J!W2)c?CqyB-wx`-f1ErPA6tgWpa3R)~uG$gXjE^H#vMUG@q
zK|cr=F_!z$yS=Z_Hn&{+;rnAhm~<WA&hxN0-n#g}^PF=&=bQ%~lT&On>Db~;I~-!`
z=vbmN_$Yl`p2?h$#}ZvDlylqSjk}DsM(NaeqFa8iP9j$GVRiEzCsuof59$;ql1DVE
z>H9~t$D2>y{eI}TUz<Uo?18^Di%;4Ej=%Jn$39bRJlPGZ<+6!ZYj=n(rDs2_cq6;9
zRCK{xa3EavB3fSJ=a&>?x#zh{AZe4F-Auf7Q`(NX^<K<p&*4SRj@8OXq^d!rt08{&
z=AD!~3s1HmgHk)lxyM!wImK4?227`qAybJUT=Zc@SwuwfAy`;Mwj$zTx(Ab~qiiB0
z&P0_uP?r|WW%^Jktzkskk1xdqeBJP3Sn5DdOJL!Lg-zlxhl{MsK-`Qc$<xSa0_<WF
zZb!S|jvmG}u>mPHgr{rgsb;G_QDb6+U9OAUFf8mvUP)7TD=r8oSP8a8QC-JK>;N@v
z)<ublcj^~hjWu98)Qb%{2SI&{Z|ZBvN*=Re3kC$UE-~&iaVJsb0jUjFqGq_355g00
zVLmW~q2*3oj+l9_F8v}p^q+G^?{<R<*c&f~ws34>Baa!TS(x+p%MtxV#n|9Kp+;Es
pdZWnLLrf4+La8GVQ^Y=F?H>#$+i6j^&6EHD002ovPDHLkV1h@)5;Xt-

diff --git a/htdocs/theme/md/img/off.png b/htdocs/theme/md/img/off.png
deleted file mode 100644
index 9bab123aca7f214c66ac06f8a1635eed9d8ee9e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 248
zcmV<U00;kxP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0002LNkl<Zcmb8r
zL2ANa5XJG|uJ$kzdZC!8H&RI!Qt3sC^bm@kBrd+B(18y>tP9`U%sl=ukMXKL^sa7h
zE;^M5z1y1#k9xBb`7u4(@gCcop18|hMDS@P{Y^>ZAdXf*FQ63~Nm64i(j9OWYqG#X
zjiphfXW(YaSWQO4!!xLrN{CB=EVXDdb^^LsHE}4qX(P1(s%YR~9h0Q>6)!L+KjDeD
yvSyC|BH!M)$9iJ{jJ72LRCdk=gOiQ9*YpbvQLBz5<54^S0000<MNUMnLSTY#>}RC_

diff --git a/htdocs/theme/md/img/on.png b/htdocs/theme/md/img/on.png
deleted file mode 100644
index 7d0344d4dbb4584f45eb469d43a3506fa9057bcc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmV<C02%*@P)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz00023Nkl<Zcmb8q
z!EM4Y7{}4qu7CqORCJFF0LrmrKyICbMwHzOU4h6*buW=ES-$Z5U!Ua9p06_)jRrxp
zjf;o0EIM1OdiN_;yV+9OD5UJqRVR08kdxlsRL*@g$cx@A3cyekUkgc+Juph{`uylr
zh~!w%toQ1>CXz#bF0+q{Bs(C8nW;#$0ys+x`!rX-%&py|#(o4PTh|78Q`MQoa*LCo
gS+I9>u(R@P|HtH;y42vvYybcN07*qoM6N<$f*(s}5&!@I


From f7df9e1d1f930c645c9cb36c5dc1129b0fa005be Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 31 Oct 2017 16:49:39 +0100
Subject: [PATCH 54/86] Fix travis

---
 htdocs/product/class/html.formproduct.class.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 02c7bcddd0d..68e80454b22 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -413,13 +413,11 @@ class FormProduct
 	}
 
 	/**
-	 * Load in cache array list of lot available in stock
-	 * If fk_product is not 0, we do not use cache
+	 * Load in cache array list of lot available in stock from a given list of products
 	 *
 	 * @param	array	$productIdArray		array of product id's from who to get lot numbers. A
-	 * @param	string	$fk_entrepot	    load lot in fk_entrepot all if 0.
 	 *
-	 * @return  int  		    		    Nb of loaded lines, 0 if nothing loaded, <0 if KO
+	 * @return	int							Nb of loaded lines, 0 if nothing loaded, <0 if KO
 	 */
 	private function loadLotStock($productIdArray = array())
 	{

From 3e58f7c609aca046df72425afcf8f5c10e31c683 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 31 Oct 2017 17:20:29 +0100
Subject: [PATCH 55/86] Fix create line extra fields

---
 htdocs/expedition/class/expedition.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 4209c0b71e4..3e341e6d5be 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -378,7 +378,7 @@ class Expedition extends CommonObject
 		$expeditionline->entrepot_id = $entrepot_id;
 		$expeditionline->fk_origin_line = $origin_line_id;
 		$expeditionline->qty = $qty;
-		$expeditionline->$array_options = $array_options;
+		$expeditionline->array_options = $array_options;
 
 		if (($lineId = $expeditionline->insert()) < 0)
 		{

From 2094ae1a57ba2a5bf43a6b0810236ebfc8f4828c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 19:28:34 +0100
Subject: [PATCH 56/86] NEW Add filter on event code on automatic filling setup
 page

---
 htdocs/admin/agenda.php       | 53 ++++++++++++++++++++++++++---------
 htdocs/admin/agenda_other.php | 18 ++++++------
 2 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index cd07b4db587..57edea39a32 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -38,6 +38,7 @@ $langs->load("agenda");
 $action = GETPOST('action','alpha');
 $cancel = GETPOST('cancel','alpha');
 
+$search_event = GETPOST('search_event', 'alpha');
 
 // Get list of triggers available
 $sql = "SELECT a.rowid, a.code, a.label, a.elementtype";
@@ -70,6 +71,12 @@ else
  *	Actions
  */
 
+// Purge search criteria
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+{
+	$search_event = '';
+}
+
 if ($action == "save" && empty($cancel))
 {
     $i=0;
@@ -78,10 +85,13 @@ if ($action == "save" && empty($cancel))
 
 	foreach ($triggers as $trigger)
 	{
-		$param='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
+		$keyparam='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
 		//print "param=".$param." - ".$_POST[$param];
-		$res = dolibarr_set_const($db,$param,(GETPOST($param,'alpha')?GETPOST($param,'alpha'):''),'chaine',0,'',$conf->entity);
-		if (! $res > 0) $error++;
+		if ($search_event === '' || preg_match('/'.preg_quote($search_event,'/').'/i', $keyparam))
+		{
+			$res = dolibarr_set_const($db,$keyparam,(GETPOST($keyparam,'alpha')?GETPOST($keyparam,'alpha'):''),'chaine',0,'',$conf->entity);
+			if (! $res > 0) $error++;
+		}
 	}
 
  	if (! $error)
@@ -140,6 +150,8 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="save">';
 
+$param = '';
+$param.= '&search_event='.urlencode($search_event);
 
 $head=agenda_prepare_head();
 
@@ -151,8 +163,19 @@ print "<br>\n";
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td colspan="2">'.$langs->trans("ActionsEvents").'</td>';
-print '<td><a href="'.$_SERVER["PHP_SELF"].'?action=selectall">'.$langs->trans("All").'</a>/<a href="'.$_SERVER["PHP_SELF"].'?action=selectnone">'.$langs->trans("None").'</a>';
+print '<td class="liste_titre"><input type="text" name="search_event" value="'.dol_escape_htmltag($search_event).'"></td>';
+print '<td class="liste_titre"></td>';
+// Action column
+print '<td class="liste_titre" align="right">';
+$searchpicto=$form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>';
+print '</tr>'."\n";
+print '<tr class="liste_titre">';
+print '<th class="liste_titre">'.$langs->trans("ActionsEvents").'</th>';
+print '<th class="liste_titre"></th>';
+print '<th class="liste_titre"><a href="'.$_SERVER["PHP_SELF"].'?action=selectall'.($param?$param:'').'">'.$langs->trans("All").'</a>/<a href="'.$_SERVER["PHP_SELF"].'?action=selectnone'.($param?$param:'').'">'.$langs->trans("None").'</a></th>';
 print '</tr>'."\n";
 // Show each trigger (list is in c_action_trigger)
 if (! empty($triggers))
@@ -173,15 +196,17 @@ if (! empty($triggers))
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_UNBILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) continue;
 
-
-			print '<tr class="oddeven">';
-			print '<td>'.$trigger['code'].'</td>';
-			print '<td>'.$trigger['label'].'</td>';
-			print '<td align="right" width="40">';
-			$key='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
-			$value=$conf->global->$key;
-			print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
-			print '</td></tr>'."\n";
+			if ($search_event === '' || preg_match('/'.preg_quote($search_event,'/').'/i', $trigger['code']))
+			{
+				print '<tr class="oddeven">';
+				print '<td>'.$trigger['code'].'</td>';
+				print '<td>'.$trigger['label'].'</td>';
+				print '<td align="right" width="40">';
+				$key='MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
+				$value=$conf->global->$key;
+				print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.((($action=='selectall'||$value) && $action!="selectnone")?' checked':'').'>';
+				print '</td></tr>'."\n";
+			}
 		}
 	}
 }
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index a999db51857..ab53bfb937f 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -352,6 +352,15 @@ else
 }
 print '</td></tr>'."\n";
 
+// AGENDA_DEFAULT_VIEW
+print '<tr class="oddeven">'."\n";
+print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
+print '<td align="center">&nbsp;</td>'."\n";
+print '<td align="right">'."\n";
+$tmplist=array('show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
+print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
+print '</td></tr>'."\n";
+
 if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
 
@@ -381,15 +390,6 @@ print '<td align="right">'."\n";
 $formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100');
 print '</td></tr>'."\n";
 
-// AGENDA_DEFAULT_VIEW
-print '<tr class="oddeven">'."\n";
-print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
-print '<td align="center">&nbsp;</td>'."\n";
-print '<td align="right">'."\n";
-$tmplist=array('show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
-print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
-print '</td></tr>'."\n";
-
 print '</table>';
 
 dol_fiche_end();

From 1db68b2a32222b13f32aeb9ad5bd0bd105d8ecdc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 19:37:41 +0100
Subject: [PATCH 57/86] Translation

---
 htdocs/langs/en_US/admin.lang | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f91231f4296..94a7651af49 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -464,6 +464,7 @@ FreeLegalTextOnExpenseReports=Free legal text on expense reports
 WatermarkOnDraftExpenseReports=Watermark on draft expense reports
 AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
 FilesAttachedToEmail=Attach file
+SendEmailsReminders=Send agenda reminders by emails
 # Modules
 Module0Name=Users & groups
 Module0Desc=Users / Employees and Groups management
@@ -1556,8 +1557,8 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of e
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
-AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
+AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder <b>on users browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####

From 9458c80c48a8041ece33f4de7dfaf0df6baef2f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 23:10:29 +0100
Subject: [PATCH 58/86] Work on reminders

---
 htdocs/comm/action/class/actioncomm.class.php |   8 +
 .../action/class/actioncommreminder.class.php | 229 ++++++++++++++++++
 htdocs/core/class/commonobject.class.php      |  10 -
 htdocs/core/lib/modulebuilder.lib.php         |  14 +-
 .../install/mysql/migration/6.0.0-7.0.0.sql   |  20 ++
 .../tables/llx_actioncomm_reminder.key.sql    |  25 ++
 .../mysql/tables/llx_actioncomm_reminder.sql  |  27 +++
 htdocs/modulebuilder/index.php                |  29 ++-
 .../template/class/myobject.class.php         |  20 +-
 .../modulebuilder/template/myobject_list.php  |   2 +-
 htdocs/modulebuilder/template/sql/data.sql    |   2 +-
 htdocs/societe/website.php                    |   2 +-
 12 files changed, 339 insertions(+), 49 deletions(-)
 create mode 100644 htdocs/comm/action/class/actioncommreminder.class.php
 create mode 100644 htdocs/install/mysql/tables/llx_actioncomm_reminder.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_actioncomm_reminder.sql

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index bec1c3ac8f6..abfc98b7219 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1530,10 +1530,18 @@ class ActionComm extends CommonObject
     		return 0;
     	}
 
+    	$now = dol_now();
+
     	dol_syslog(__METHOD__, LOG_DEBUG);
 
+		// TODO Scan events of type 'email' into table llx_actioncomm_reminder with status todo, send email, then set status to done
 
 
+
+    	// Delete also very old past events (we do not keep more than 1 month record in past)
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_reminder WHERE dateremind < '".$this->jdate($now - (3600 * 24 * 32))."'";
+		$this->db->query($sql);
+
     	return 0;
     }
 
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
new file mode 100644
index 00000000000..4873db461f6
--- /dev/null
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -0,0 +1,229 @@
+<?php
+/* Copyright (C) 2017  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/>.
+ */
+
+/**
+ * \file        class/actioncommreminder.class.php
+ * \ingroup     agenda
+ * \brief       This file is a CRUD class file for ActionCommReminder (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+
+
+/**
+ * Class for ActionCommReminder
+ */
+class ActionCommReminder extends CommonObject
+{
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'actioncomm_reminder';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'actioncomm_reminder';
+	/**
+	 * @var array  Does actioncommreminder support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 */
+	public $ismultientitymanaged = 0;
+	/**
+	 * @var string String with name of icon for actioncommreminder. Must be the part after the 'object_' into object_actioncommreminder.png
+	 */
+	public $picto = 'generic';
+
+
+	/**
+	 *  'type' if the field format.
+	 *  '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. Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  '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. It is not used by application.
+	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+	 *  'showoncombobox' if field must be shown into the label of combobox
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
+		'dateremind' => array('type'=>'datetime', 'label'=>'DateRemind', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>1, 'index'=>1,),
+		'typeremind' => array('type'=>'varchar(32)', 'label'=>'TypeRemind', 'visible'=>-1, 'enabled'=>1, 'position'=>55, 'notnull'=>1, 'comment'=>"email, browser, sms",),
+		'fk_user' => array('type'=>'integer', 'label'=>'User', 'visible'=>-1, 'enabled'=>1, 'position'=>65, 'notnull'=>1, 'index'=>1,),
+		'offsetvalue' => array('type'=>'integer', 'label'=>'OffsetValue', 'visible'=>1, 'enabled'=>1, 'position'=>56, 'notnull'=>1,),
+		'offsetunit' => array('type'=>'varchar(1)', 'label'=>'OffsetUnit', 'visible'=>1, 'enabled'=>1, 'position'=>57, 'notnull'=>1, 'comment'=>"m, h, d, w",),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>0, 'arrayofkeyval'=>array('0'=>'ToDo', '1'=>'Done')),
+	);
+	public $rowid;
+	public $dateremind;
+	public $typeremind;
+	public $fk_user;
+	public $offsetvalue;
+	public $offsetunit;
+	public $status;
+	// END MODULEBUILDER PROPERTIES
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf;
+
+		$this->db = $db;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
+		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		return $this->createCommon($user, $notrigger);
+	}
+
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		return $result;
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+	}
+
+	/**
+	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *
+	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @return	string 			       Label of status
+	 */
+	function getLibStatut($mode=0)
+	{
+		return $this->LibStatut($this->status,$mode);
+	}
+
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        	Id status
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       	Label of status
+	 */
+	static function LibStatut($status,$mode=0)
+	{
+		global $langs;
+
+		if ($mode == 0)
+		{
+			$prefix='';
+			if ($status == 1) return $langs->trans('Done');
+			if ($status == 0) return $langs->trans('ToDo');
+		}
+		if ($mode == 1)
+		{
+			if ($status == 1) return $langs->trans('Done');
+			if ($status == 0) return $langs->trans('ToDo');
+		}
+		if ($mode == 2)
+		{
+			if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
+			if ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
+		}
+		if ($mode == 3)
+		{
+			if ($status == 1) return img_picto($langs->trans('Done'),'statut4');
+			if ($status == 0) return img_picto($langs->trans('ToDo'),'statut5');
+		}
+		if ($mode == 4)
+		{
+			if ($status == 1) return img_picto($langs->trans('Done'),'statut4').' '.$langs->trans('Done');
+			if ($status == 0) return img_picto($langs->trans('ToDo'),'statut5').' '.$langs->trans('ToDo');
+		}
+		if ($mode == 5)
+		{
+			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
+			if ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
+		}
+		if ($mode == 6)
+		{
+			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'),'statut4');
+			if ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'),'statut5');
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
+
+}
+
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4bffc579a8c..0659d929ec5 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -340,16 +340,6 @@ abstract class CommonObject
 
 	// No constructor as it is an abstract class
 
-	/**
-	 * Return if an object manage the multicompany field and how.
-	 *
-	 * @return	int				0=No entity field managed, 1=Test with field entity, 2=Test with link to thirdparty (and sales representative)
-	 */
-	function getIsmultientitymanaged()
-	{
-		return $this->ismultientitymanaged;
-	}
-
 	/**
 	 * Check an object id/ref exists
 	 * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index aadea327d77..c437d47ce69 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -132,9 +132,9 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir='
                 $texttoinsert.= " 'notnull'=>".($val['notnull']!=''?$val['notnull']:-1).",";
                 if ($val['index']) $texttoinsert.= " 'index'=>".$val['index'].",";
                 if ($val['searchall']) $texttoinsert.= " 'searchall'=>".$val['searchall'].",";
-                if ($val['comment']) $texttoinsert.= " 'comment'=>'".$val['comment']."',";
+                if ($val['comment']) $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\",";	// addslashes is escape for PHP
                 if ($val['isameasure']) $texttoinsert.= " 'isameasure'=>'".$val['isameasure']."',";
-                if ($val['help']) $texttoinsert.= " 'help'=>'".$val['help']."',";
+                if ($val['help']) $texttoinsert.= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";			// addslashes is escape for PHP
                 if ($val['arrayofkeyval'])
                 {
                 	$texttoinsert.= " 'arrayofkeyval'=>array(";
@@ -215,8 +215,8 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='',
     $pathoffiletoclasssrc=$readdir.'/class/'.strtolower($objectname).'.class.php';
 
     // Edit .sql file
-    $pathoffiletoeditsrc=$readdir.'/sql/llx_'.strtolower($objectname).'.sql';
-    $pathoffiletoedittarget=$destdir.'/sql/llx_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+    $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");
@@ -287,8 +287,8 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='',
     }
 
     // Edit .key.sql file
-    $pathoffiletoeditsrc=$destdir.'/sql/llx_'.strtolower($objectname).'.key.sql';
-    $pathoffiletoedittarget=$destdir.'/sql/llx_'.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');
 
@@ -301,7 +301,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='',
             $i++;
             if ($val['index'])
             {
-                $texttoinsert.= "ALTER TABLE llx_".strtolower($objectname)." ADD INDEX idx_".strtolower($objectname)."_".$key." (".$key.");";
+                $texttoinsert.= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
                 $texttoinsert.= "\n";
             }
         }
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index e534c793ac8..4988a32479a 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -461,6 +461,26 @@ UPDATE llx_accounting_system SET fk_country =140 WHERE pcg_version = 'PCN-LUXEMB
 UPDATE llx_accounting_system SET fk_country = 12 WHERE pcg_version = 'PCG';
 
 
+
+CREATE TABLE llx_actioncomm_reminder(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	dateremind datetime NOT NULL, 
+	typeremind varchar(32) NOT NULL, 
+	fk_user integer NOT NULL, 
+	offsetvalue integer NOT NULL, 
+	offsetunit varchar(1) NOT NULL,
+	status integer NOT NULL DEFAULT 0
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
+
+ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_rowid (rowid);
+ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_dateremind (dateremind);
+ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_fk_user (fk_user);
+
+ALTER TABLE llx_actioncomm_reminder ADD UNIQUE INDEX uk_actioncomm_reminder_unique(fk_user, typeremind, offsetvalue, offsetunit);
+
+
 -- VPGSQL8.2 CREATE SEQUENCE llx_supplier_proposal_rowid_seq;
 -- VPGSQL8.2 ALTER TABLE llx_supplier_proposal ALTER COLUMN rowid SET DEFAULT nextval('llx_supplier_proposal_rowid_seq');
 -- VPGSQL8.2 ALTER TABLE llx_supplier_proposal ALTER COLUMN rowid SET NOT NULL;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_reminder.key.sql b/htdocs/install/mysql/tables/llx_actioncomm_reminder.key.sql
new file mode 100644
index 00000000000..4e10b5489bc
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_actioncomm_reminder.key.sql
@@ -0,0 +1,25 @@
+-- Copyright (C) 2017 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/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_rowid (rowid);
+ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_dateremind (dateremind);
+ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_fk_user (fk_user);
+-- END MODULEBUILDER INDEXES
+
+ALTER TABLE llx_actioncomm_reminder ADD UNIQUE INDEX uk_actioncomm_reminder_unique(fk_user, typeremind, offsetvalue, offsetunit);
+
+
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql b/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql
new file mode 100644
index 00000000000..9c8e7beed46
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) 2017 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_actioncomm_reminder(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	dateremind datetime NOT NULL, 
+	typeremind varchar(32) NOT NULL, 
+	fk_user integer NOT NULL, 
+	offsetvalue integer NOT NULL, 
+	offsetunit varchar(1) NOT NULL,
+	status integer NOT NULL DEFAULT 0
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 41aca4c904f..90ce90859f5 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -375,7 +375,7 @@ if ($dirins && $action == 'addproperty' && !empty($module) && ! empty($tabobj))
 		'arrayofkeyval'=>GETPOST('proparrayofkeyval','none'),		// Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
 		'visible'=>GETPOST('propvisible','int'),'enabled'=>GETPOST('propenabled','int'),
 		'position'=>GETPOST('propposition','int'),'notnull'=>GETPOST('propnotnull','int'),'index'=>GETPOST('propindex','int'),'searchall'=>GETPOST('propsearchall','int'),
-		'isameasure'=>GETPOST('propisameasure','int'), 'comment'=>GETPOST('propcomment','alpha'),'help'=>GETPOST('prophelp'));
+		'isameasure'=>GETPOST('propisameasure','int'), 'comment'=>GETPOST('propcomment','alpha'),'help'=>GETPOST('prophelp','alpha'));
 
 	if (! empty($addfieldentry['arrayofkeyval']) && ! is_array($addfieldentry['arrayofkeyval']))
 	{
@@ -401,14 +401,14 @@ if ($dirins && $action == 'addproperty' && !empty($module) && ! empty($tabobj))
 
 	if (! $error)
 	{
-		clearstatcache();
-
 		setEventMessages($langs->trans('FilesForObjectUpdated', $objectname), null);
 
-		// Make a redirect to reload all data
-		header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=objects&module='.$module.'&tabobj='.$objectname);
+		clearstatcache(true);
+		sleep(4);	// With sleep 2, after the header("Location...", the new page output does not see the change. TODO Why do we need this sleep ?
+
+		// Make a redirect to reload all data
+		header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=objects&module='.$module.'&tabobj='.$objectname.'&nocache='.time());
 
-		clearstatcache();
 		exit;
 	}
 }
@@ -437,14 +437,14 @@ if ($dirins && $action == 'confirm_deleteproperty' && $propertykey)
 
 	if (! $error)
 	{
-		clearstatcache();
-
 		setEventMessages($langs->trans('FilesForObjectUpdated', $objectname), null);
 
+		clearstatcache(true);
+		sleep(4);	// With sleep 2, after the header("Location...", the new page output does not see the change. TODO Why do we need this sleep ?
+
 		// Make a redirect to reload all data
 		header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=objects&module='.$module.'&tabobj='.$objectname);
 
-		clearstatcache();
 		exit;
 	}
 }
@@ -768,6 +768,7 @@ if ($action == 'reset' && $user->admin)
 }
 
 
+
 /*
  * View
  */
@@ -1528,9 +1529,10 @@ elseif (! empty($module))
 						if (! empty($tmpobjet))
 						{
 							$reflector = new ReflectionClass($tabobj);
-							$properties = $reflector->getProperties();          // Can also use get_object_vars
-							//$propdefault = $reflector->getDefaultProperties();  // Can also use get_object_vars
+							$reflectorproperties = $reflector->getProperties();          // Can also use get_object_vars
+							$reflectorpropdefault = $reflector->getDefaultProperties();  // Can also use get_object_vars
 							//$propstat = $reflector->getStaticProperties();
+							//var_dump($reflectorpropdefault);
 
 							print load_fiche_titre($langs->trans("Properties"), '', '');
 
@@ -1565,7 +1567,10 @@ elseif (! empty($module))
 							print '<td></td>';
 							print '</tr>';
 
-							$properties = dol_sort_array($tmpobjet->fields, 'position');
+							// We must use $reflectorpropdefault['fields'] to get list of fields because $tmpobjet->fields may have been
+							// modified during the constructor and we want value into head of class before constructor is called.
+							//$properties = dol_sort_array($tmpobjet->fields, 'position');
+							$properties = dol_sort_array($reflectorpropdefault['fields'], 'position');
 
 							if (! empty($properties))
 							{
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index d837e413c14..2f268ebecc0 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -1,8 +1,5 @@
 <?php
-/* Copyright (C) 2007-2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
- * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
@@ -228,14 +225,14 @@ class MyObject extends CommonObject
 	 *
 	 * @return int         <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetchLines()
+	/*public function fetchLines()
 	{
 		$this->lines=array();
 
 		// Load lines with object MyObjectLine
 
 		return count($this->lines)?1:0;
-	}
+	}*/
 
 	/**
 	 * Update object into database
@@ -322,17 +319,6 @@ class MyObject extends CommonObject
 		return $result;
 	}
 
-	/**
-	 * Return link to download file from a direct external access
-	 *
-	 * @param	int				$withpicto			Add download picto into link
-	 * @return	string			HTML link to file
-	 */
-	function getDirectExternalLink($withpicto=0)
-	{
-		return 'todo';
-	}
-
 	/**
 	 *  Retourne le libelle du status d'un user (actif, inactif)
 	 *
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 36b70170b86..ab6a36b4d40 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -213,7 +213,7 @@ $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/, $/','', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX."myobject as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."myobject_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($object->getIsmultientitymanaged() == 1) $sql.= " WHERE t.entity IN (".getEntity('myobject').")";
+if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('myobject').")";
 else $sql.=" WHERE 1 = 1";
 foreach($search as $key => $val)
 {
diff --git a/htdocs/modulebuilder/template/sql/data.sql b/htdocs/modulebuilder/template/sql/data.sql
index 1bcc30cb1fd..e3980b63c2e 100644
--- a/htdocs/modulebuilder/template/sql/data.sql
+++ b/htdocs/modulebuilder/template/sql/data.sql
@@ -13,6 +13,6 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-INSERT INTO llx_myobject VALUES (
+INSERT INTO llx_mymodule_myobject VALUES (
 	1, 1, 'mydata'
 );
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index ca6065628ff..2b6349e36ae 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -257,7 +257,7 @@ $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/, $/','', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX."websiteaccount as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."websiteaccount_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($objectwebsiteaccount->getIsmultientitymanaged() == 1) $sql.= " WHERE t.entity IN (".getEntity('websiteaccount').")";
+if ($objectwebsiteaccount->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('websiteaccount').")";
 else $sql.=" WHERE 1 = 1";
 $sql.=" AND fk_soc = ".$object->id;
 foreach($search as $key => $val)

From 4220d02dd4f68a2c6f09a0dbcd7a79ffeb22ccda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 31 Oct 2017 23:57:37 +0100
Subject: [PATCH 59/86] Debug module blocked log

---
 htdocs/blockedlog/class/blockedlog.class.php                | 4 ++--
 htdocs/comm/action/index.php                                | 4 ++--
 .../interface_50_modBlockedlog_ActionsBlockedLog.class.php  | 2 +-
 htdocs/theme/eldy/style.css.php                             | 6 ++++++
 htdocs/theme/md/style.css.php                               | 5 +++++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 0dc64c5a9fe..fffd5cc9d80 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -180,11 +180,11 @@ class BlockedLog
 	public function setObjectData(&$object)
 	{
 		// Set date
-		if($object->element == 'payment' || $object->element == 'payment_supplier')
+		if ($object->element == 'payment' || $object->element == 'payment_supplier')
 		{
 			$this->date_object = $object->datepaye;
 		}
-		if ($object->element=='payment_salary')
+		elseif ($object->element=='payment_salary')
 		{
 			$this->date_object = $object->datev;
 		}
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index bda7dd7a594..7004457b97d 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1364,7 +1364,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     print '>';
                     print '<table class="centpercent cal_event'.(empty($event->transparency)?'':' cal_event_busy').'" style="'.$h;
                     print 'background: #'.$color.';';
-                    print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, 0).'), to(#'.dol_color_minus($color, 1).'));';
+                    print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -4).'), to(#'.dol_color_minus($color, -3).'));';
                     //if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
                     //else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
                     //print ' -moz-border-radius:4px;"';
@@ -1572,7 +1572,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
  * Change color with a delta
  *
  * @param	string	$color		Color
- * @param 	int		$minus		Delta (1 = 16 unit)
+ * @param 	int		$minus		Delta (1 = 16 unit). Positive value = darker color, Negative value = brighter color.
  * @param   int     $minusunit  Minus unit
  * @return	string				New color
  */
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 4eac937a476..520e02f1810 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -83,7 +83,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		$b=new BlockedLog($this->db);
 		$b->action = $action;
 		$b->amounts= $amounts;
-		$b->setObjectData($object);		// Set field ref_object, fk_object, element, object_data
+		$b->setObjectData($object);		// Set field date_object, ref_object, fk_object, element, object_data
 
 		$res = $b->create($user);
 
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 2ffb2836f15..ce0f59cf940 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3323,6 +3323,8 @@ img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
 .ui-datepicker-trigger {
 	vertical-align: middle;
 	cursor: pointer;
+	padding-left: 2px;
+	padding-right: 2px;
 }
 
 .bodyline {
@@ -3475,6 +3477,10 @@ a.websitebuttonsitepreviewdisabled img {
 /*  Module agenda                                                                 */
 /* ============================================================================== */
 
+.dayevent .tagtr:first-of-type {
+    height: 24px;
+}
+
 .agendacell { height: 60px; }
 table.cal_month    { border-spacing: 0px;  }
 table.cal_month td:first-child  { border-left: 0px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 16c1bb47129..061ab132f99 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3418,6 +3418,8 @@ img.datecallink { padding-left: 2px !important; padding-right: 2px !important; }
 .ui-datepicker-trigger {
 	vertical-align: middle;
 	cursor: pointer;
+	padding-left: 2px;
+	padding-right: 2px;
 }
 
 .bodyline {
@@ -3571,6 +3573,9 @@ a.websitebuttonsitepreviewdisabled img {
 /*  Module agenda                                                                 */
 /* ============================================================================== */
 
+.dayevent .tagtr:first-of-type {
+    height: 24px;
+}
 .agendacell { height: 60px; }
 table.cal_month    { border-spacing: 0px; }
 table.cal_month td:first-child  { border-left: 0px; }

From f9e801b4a755847908a6de4451e314315d484191 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <alexandre.spangaro@gmail.com>
Date: Wed, 1 Nov 2017 08:42:17 +0100
Subject: [PATCH 60/86] Update works

---
 htdocs/accountancy/bookkeeping/list.php       | 168 +++++++++++++-----
 .../accountancy/class/bookkeeping.class.php   |   4 +
 2 files changed, 124 insertions(+), 48 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index ca98431a16e..c3dd606adb2 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -112,7 +112,7 @@ $arrayfields=array(
 	't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
 	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
 	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
-	't.crebit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
+	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
 );
@@ -410,11 +410,11 @@ print '<tr class="liste_titre_filter">';
 if (! empty($arrayfields['t.piece_num']['checked']))
 {
 	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
-	print '<td class="liste_titre center">';
 }
 // Date document
 if (! empty($arrayfields['t.doc_date']['checked']))
 {
+	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
 	print $langs->trans('From') . ' ';
 	print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
@@ -501,6 +501,7 @@ if (! empty($arrayfields['t.code_journal']['checked']))
 // Date creation
 if (! empty($arrayfields['t.date_creation']['checked']))
 {
+	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
 	print $langs->trans('From') . ' ';
 	print $form->select_date($search_date_creation_start, 'date_creation_start', 0, 0, 1);
@@ -511,6 +512,7 @@ if (! empty($arrayfields['t.date_creation']['checked']))
 	print '</div>';
 	print '</td>';
 }
+// Action column
 print '<td class="liste_titre center">';
 $searchpicto=$form->showFilterButtons();
 print $searchpicto;
@@ -532,59 +534,129 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="c
 print "</tr>\n";
 
 
-$total_debit = 0;
-$total_credit = 0;
-
-$i=0;
-while ($i < min($num, $limit))
+if ($num > 0)
 {
-	$line = $object->lines[$i];
-
-	$total_debit += $line->debit;
-	$total_credit += $line->credit;
-
-	print '<tr class="oddeven">';
-
-	print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
-	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-	print '<td class="nowrap">' . $line->doc_ref . '</td>';
-	print '<td>' . length_accountg($line->numero_compte) . '</td>';
-	print '<td>' . length_accounta($line->subledger_account) . '</td>';
-	print '<td>' . $line->label_operation . '</td>';
-	print '<td align="right">' . ($line->debit ? price($line->debit) : ''). '</td>';
-	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
-
-	$accountingjournal = new AccountingJournal($db);
-	$result = $accountingjournal->fetch('',$line->code_journal);
-	$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
-	print '<td align="center">' . $journaltoshow . '</td>';
-	if (! empty($arrayfields['t.date_creation']['checked']))
+	$i=0;
+	$totalarray=array();
+	while ($i < min($num, $limit))
 	{
-		print '<td align="center">' . dol_print_date($line->date_creation, 'day') . '</td>';
+		$line = $object->lines[$i];
+
+		$total_debit += $line->debit;
+		$total_credit += $line->credit;
+
+		print '<tr class="oddeven">';
+
+		// Piece number
+		if (! empty($arrayfields['t.piece_num']['checked']))
+		{
+			print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Document date
+		if (! empty($arrayfields['t.doc_date']['checked']))
+		{
+			print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Document ref
+		if (! empty($arrayfields['t.doc_ref']['checked']))
+		{
+			print '<td class="nowrap">' . $line->doc_ref . '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Account number
+		if (! empty($arrayfields['t.numero_compte']['checked']))
+		{
+			print '<td>' . length_accountg($line->numero_compte) . '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Subledger account
+		if (! empty($arrayfields['t.subledger_account']['checked']))
+		{
+			print '<td>' . length_accounta($line->subledger_account) . '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Label operation
+		if (! empty($arrayfields['t.label_operation']['checked']))
+		{
+			print '<td>' . $line->label_operation . '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Amount debit
+		if (! empty($arrayfields['t.debit']['checked']))
+		{
+			print '<td align="right">' . ($line->debit ? price($line->debit) : ''). '</td>';
+			if (! $i) $totalarray['nbfield']++;
+			if (! $i) $totalarray['totaldebitfield']=$totalarray['nbfield'];
+			$totalarray['totaldebit'] += $line->debit;
+		}
+
+		// Amount credit
+		if (! empty($arrayfields['t.credit']['checked']))
+		{
+			print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
+			if (! $i) $totalarray['nbfield']++;
+			if (! $i) $totalarray['totalcreditfield']=$totalarray['nbfield'];
+			$totalarray['totalcredit'] += $line->credit;
+		}
+
+		// Journal code
+		if (! empty($arrayfields['t.code_journal']['checked']))
+		{
+			$accountingjournal = new AccountingJournal($db);
+			$result = $accountingjournal->fetch('',$line->code_journal);
+			$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
+			print '<td align="center">' . $journaltoshow . '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Creation operation date
+		if (! empty($arrayfields['t.date_creation']['checked']))
+		{
+			print '<td align="center">' . dol_print_date($line->date_creation, 'day') . '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
+		// Action column
+		print '<td align="center">';
+		print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
+		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . '">' . img_delete() . '</a>';
+		print '</td>';
+		if (! $i) $totalarray['nbfield']++;
+
+		print "</tr>\n";
+
+		$i++;
 	}
 
-	print '<td align="center">';
-	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
-	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . '">' . img_delete() . '</a>';
-	print '</td>';
-	print "</tr>\n";
+	// Show total line
+	if (isset($totalarray['totaldebitfield']) || isset($totalarray['totalcreditfield']))
+	{
+		$i=0;
+		while ($i < $totalarray['nbfield'])
+		{
+			$i++;
+				if ($i == 1)
+				{
+					if ($num < $limit && empty($offset)) print '<td align="left">'.$langs->trans("Total").'</td>';
+					else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+				}
+				elseif ($totalarray['totaldebitfield'] == $i)  print '<td align="right">'.price($totalarray['totaldebit']).'</td>';
+				elseif ($totalarray['totalcreditfield'] == $i) print '<td align="right">'.price($totalarray['totalcredit']).'</td>';
+				else print '<td></td>';
+		}
+		print '</tr>';
 
-	$i++;
+	}
 }
 
-print '<tr class="liste_total">';
-if ($num < $limit) print '<td align="left" colspan="7">'.$langs->trans("Total").'</td>';
-else print '<td align="left" colspan="7">'.$langs->trans("Totalforthispage").'</td>';
-print '</td>';
-print '<td  align="right">';
-print price($total_debit);
-print '</td>';
-print '<td align="right">';
-print price($total_credit);
-print '</td>';
-print '<td colspan="2"></td>';
-print '</tr>';
-
 print "</table>";
 print '</div>';
 
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index cf35a3d8fff..2f5e1a6bbd7 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -678,6 +678,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} elseif ($key == 't.label_operation') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
+					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 				}
@@ -798,6 +800,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . '=' . $value;
 				} elseif ($key == 't.subledger_account' || $key == 't.numero_compte') {
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
+				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
+					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 				}

From f26d970d5802345138cc37432fc8a8d52dfb37cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Nov 2017 10:09:39 +0100
Subject: [PATCH 61/86] Remove option MAIN_HTML5_PLACEHOLDER (on by default
 now)

---
 htdocs/bookmarks/bookmarks.lib.php       | 198 ++++++++++++-----------
 htdocs/core/class/commonobject.class.php |   3 +-
 htdocs/core/class/html.form.class.php    |   6 +-
 htdocs/core/lib/functions.lib.php        |   6 +-
 htdocs/core/search_page.php              |   3 -
 htdocs/main.inc.php                      |  25 +--
 6 files changed, 114 insertions(+), 127 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 5224acd1e70..cb234de583f 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -35,111 +35,117 @@ function printBookmarksList($aDb, $aLangs)
 	$db = $aDb;
 	$langs = $aLangs;
 
-	require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
-	if (! isset($conf->global->BOOKMARKS_SHOW_IN_MENU)) $conf->global->BOOKMARKS_SHOW_IN_MENU=5;
-
-	$langs->load("bookmarks");
-
-	$url= $_SERVER["PHP_SELF"];
-
-	if (! empty($_SERVER["QUERY_STRING"]))
-	{
-	    $url.=(dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'');
-	}
-	else
-	{
-	    global $sortfield,$sortorder;
-	    $tmpurl='';
-	    // No urlencode, all param $url will be urlencoded later
-	    if ($sortfield) $tmpurl.=($tmpurl?'&':'').'sortfield='.$sortfield;
-	    if ($sortorder) $tmpurl.=($tmpurl?'&':'').'sortorder='.$sortorder;
-	    if (is_array($_POST))
-	    {
-    	    foreach($_POST as $key => $val)
-    	    {
-                if (preg_match('/^search_/', $key) && $val != '') $tmpurl.=($tmpurl?'&':'').$key.'='.$val;
-    	    }
-	    }
-	    $url.=($tmpurl?'?'.$tmpurl:'');
-	}
-
-	$ret = '';
-
-	// Menu bookmark
 	$ret.= '<div class="menu_top"></div>'."\n";
 
-	$ret.= '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
-	$ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
-	$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo" alt="Bookmarks">';
-	$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
-    $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
-	// Url to go on create new bookmark page
-	if ($user->rights->bookmark->creer)
-	{
-    	//$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
-	    $urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
-    	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'...</option>';
-	}
-	// Menu with all bookmarks
-	if (! empty($conf->global->BOOKMARKS_SHOW_IN_MENU))
-	{
-		$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
-		$sql.= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
-        $sql.= " AND entity IN (".getEntity('bookmarks').")";
-		$sql.= " ORDER BY position";
-		if ($resql = $db->query($sql) )
+	if (! empty($conf->use_javascript_ajax)) {		// Bookmark autosubmit can't work when javascript is off.
+
+		require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
+		if (! isset($conf->global->BOOKMARKS_SHOW_IN_MENU)) $conf->global->BOOKMARKS_SHOW_IN_MENU=5;
+
+		$langs->load("bookmarks");
+
+		$url= $_SERVER["PHP_SELF"];
+
+		if (! empty($_SERVER["QUERY_STRING"]))
 		{
-			$i=0;
-			while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql))
-			{
-			    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">';
-			    //$ret.='<span class="fa fa-print">aa</span>';
-			    $ret.=img_picto('','object_bookmark').' ';
-			    $ret.=$obj->title;
-			    $ret.='</option>';
-				$i++;
-			}
+		    $url.=(dol_escape_htmltag($_SERVER["QUERY_STRING"])?'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]):'');
 		}
 		else
 		{
-			dol_print_error($db);
+		    global $sortfield,$sortorder;
+		    $tmpurl='';
+		    // No urlencode, all param $url will be urlencoded later
+		    if ($sortfield) $tmpurl.=($tmpurl?'&':'').'sortfield='.$sortfield;
+		    if ($sortorder) $tmpurl.=($tmpurl?'&':'').'sortorder='.$sortorder;
+		    if (is_array($_POST))
+		    {
+	    	    foreach($_POST as $key => $val)
+	    	    {
+	                if (preg_match('/^search_/', $key) && $val != '') $tmpurl.=($tmpurl?'&':'').$key.'='.$val;
+	    	    }
+		    }
+		    $url.=($tmpurl?'?'.$tmpurl:'');
 		}
+
+		$ret = '';
+
+		// Menu bookmark
+		$ret.= '<div class="menu_top"></div>'."\n";
+
+		$ret.= '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
+		$ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
+		$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo" alt="Bookmarks">';
+		$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
+	    $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
+		// Url to go on create new bookmark page
+		if (! empty($user->rights->bookmark->creer))
+		{
+	    	//$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
+		    $urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
+	    	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'...</option>';
+		}
+		// Menu with all bookmarks
+		if (! empty($conf->global->BOOKMARKS_SHOW_IN_MENU))
+		{
+			$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
+			$sql.= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
+	        $sql.= " AND entity IN (".getEntity('bookmarks').")";
+			$sql.= " ORDER BY position";
+			if ($resql = $db->query($sql) )
+			{
+				$i=0;
+				while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql))
+				{
+				    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">';
+				    //$ret.='<span class="fa fa-print">aa</span>';
+				    $ret.=img_picto('','object_bookmark').' ';
+				    $ret.=dol_escape_htmltag($obj->title);
+				    $ret.='</option>';
+					$i++;
+				}
+			}
+			else
+			{
+				dol_print_error($db);
+			}
+		}
+
+		$ret.= '</select>';
+		$ret.= '</form>';
+
+		$ret.=ajax_combobox('boxbookmark');
+
+		$ret.='<script type="text/javascript">
+	        	$(document).ready(function () {';
+		$ret.='    jQuery("#boxbookmark").change(function() {
+		            var urlselected = jQuery("#boxbookmark option:selected").attr("rel");
+					if (! urlselected) console.log("Error, failed to get the URL to jump to from the rel attribute");
+		            var urltarget = jQuery("#boxbookmark option:selected").attr("target");
+		            if (! urltarget) { urltarget=""; }
+	                jQuery("form#actionbookmark").attr("target",urltarget);
+		            jQuery("form#actionbookmark").attr("action",urlselected);
+
+		            console.log("We change select bookmark. We choose urlselected="+urlselected+" with target="+urltarget);
+
+		            // Method is POST for internal link, GET for external
+		            if (urlselected.startsWith(\'http\'))
+		            {
+		                var newmethod=\'GET\';
+		                jQuery("form#actionbookmark").attr("method", newmethod);
+		                console.log("We change method to newmethod="+newmethod);
+			            jQuery("#actionbookmark").submit();
+		                console.log("We restore method to POST");
+						jQuery("form#actionbookmark").attr("method", \'POST\');
+					}
+					else
+					{
+		            	jQuery("#actionbookmark").submit();
+					}
+		       });';
+		$ret.='})</script>';
 	}
 
-	$ret.= '</select>';
-	$ret.= '</form>';
-
-	$ret.=ajax_combobox('boxbookmark');
-
-	$ret.='<script type="text/javascript">
-        	$(document).ready(function () {';
-	$ret.='    jQuery("#boxbookmark").change(function() {
-	            var urlselected = jQuery("#boxbookmark option:selected").attr("rel");
-				if (! urlselected) console.log("Error, failed to get the URL to jump to from the rel attribute");
-	            var urltarget = jQuery("#boxbookmark option:selected").attr("target");
-	            if (! urltarget) { urltarget=""; }
-                jQuery("form#actionbookmark").attr("target",urltarget);
-	            jQuery("form#actionbookmark").attr("action",urlselected);
-
-	            console.log("We change select bookmark. We choose urlselected="+urlselected+" with target="+urltarget);
-
-	            // Method is POST for internal link, GET for external
-	            if (urlselected.startsWith(\'http\'))
-	            {
-	                var newmethod=\'GET\';
-	                jQuery("form#actionbookmark").attr("method", newmethod);
-	                console.log("We change method to newmethod="+newmethod);
-		            jQuery("#actionbookmark").submit();
-	                console.log("We restore method to POST");
-					jQuery("form#actionbookmark").attr("method", \'POST\');
-				}
-				else
-				{
-	            	jQuery("#actionbookmark").submit();
-				}
-	       });';
-	$ret.='})</script>';
-	$ret .= '<div class="menu_end"></div>';
+	$ret.= '<div class="menu_end"></div>'."\n";
 
 	return $ret;
 }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 0659d929ec5..d52a2edf73c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3702,8 +3702,7 @@ abstract class CommonObject
 		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)
 		{
 			$label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
-			if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("Label").'"';
-			else $placeholder=' title="'.$langs->trans("Label").'"';
+			$placeholder=' placeholder="'.$langs->trans("Label").'"';
 
 			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e7ed9b121f7..9acf2a9e56b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1010,8 +1010,7 @@ class Form
 			$out.='<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
 			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
 			else if ($hidelabel > 1) {
-				if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
-				else $placeholder=' title="'.$langs->trans("RefOrLabel").'"';
+				$placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
 				if ($hidelabel == 2) {
 					$out.=  img_picto($langs->trans("Search"), 'search');
 				}
@@ -1818,8 +1817,7 @@ class Form
 			}
 			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
 			else if ($hidelabel > 1) {
-				if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
-				else $placeholder=' title="'.$langs->trans("RefOrLabel").'"';
+				$placeholder=' placeholder="'.$langs->trans("RefOrLabel").'"';
 				if ($hidelabel == 2) {
 					print img_picto($langs->trans("Search"), 'search');
 				}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 45a5fa09838..f90eb65c15d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -927,10 +927,10 @@ function dol_escape_js($stringtoescape, $mode=0, $noescapebackslashn=0)
 function dol_escape_htmltag($stringtoescape, $keepb=0, $keepn=0)
 {
 	// escape quotes and backslashes, newlines, etc.
-	$tmp=html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');		// TODO Use htmlspecialchars_decode instead, that make only required change for html form content
+	$tmp=html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');		// TODO Use htmlspecialchars_decode instead, that make only required change for html tags
 	if (! $keepb) $tmp=strtr($tmp, array("<b>"=>'','</b>'=>''));
 	if (! $keepn) $tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n'));
-	return htmlentities($tmp, ENT_COMPAT, 'UTF-8');						// TODO Use htmlspecialchars instead, that make only required change for html form content
+	return htmlentities($tmp, ENT_COMPAT, 'UTF-8');						// TODO Use htmlspecialchars instead, that make only required change for html tags
 }
 
 
@@ -4952,7 +4952,7 @@ function picto_required()
  */
 function dol_string_nohtmltag($stringtoclean,$removelinefeed=1,$pagecodeto='UTF-8')
 {
-	// TODO Try to replace with strip_tags($stringtoclean)
+	// TODO Try to replace with  strip_tags($stringtoclean)
 	$pattern = "/<[^<>]+>/";
 	$stringtoclean = preg_replace('/<br[^>]*>/', "\n", $stringtoclean);
 	$temp = dol_html_entity_decode($stringtoclean,ENT_COMPAT,$pagecodeto);
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 61d39af045e..eb873d0e8f9 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -77,9 +77,6 @@ if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 }
 else
 {
-    $conf->global->MAIN_HTML5_PLACEHOLDER = 1;
-
-
     $usedbyinclude = 1; // Used into next include
     include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2c0141f3b40..e98a306390e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1618,7 +1618,6 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 			$selected=-1;
 			$usedbyinclude=1;
 			include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
-			$conf->global->MAIN_HTML5_PLACEHOLDER=1;
 
 			foreach($arrayresult as $key => $val)
 			{
@@ -1818,7 +1817,8 @@ function getHelpParamFor($helppagename,$langs)
 
 
 /**
- *  Show a search area
+ *  Show a search area.
+ *  Used when the javascript quick search is not used.
  *
  *  @param  string	$urlaction          Url post
  *  @param  string	$urlobject          Url of the link under the search box
@@ -1832,7 +1832,7 @@ function getHelpParamFor($helppagename,$langs)
  */
 function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey='', $prefhtmlinputname='',$img='')
 {
-	global $conf,$langs;
+	global $conf,$langs,$user;
 
 	if (empty($htmlinputid)) {
 		$htmlinputid = $htmlinputname;
@@ -1840,26 +1840,13 @@ function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinpu
 
 	$ret='';
 	$ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
-	if (empty($conf->global->MAIN_HTML5_PLACEHOLDER))
-	{
-		$ret.='<div class="menu_titre menu_titre_search"';
-		if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="display: inline-block"';
-		$ret.='>';
-		$ret.='<label for="'.$prefhtmlinputname.$htmlinputname.'">';
-		$ret.='<a class="vsmenu" href="'.$urlobject.'">';
-	   	if ($img && ! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=$img;
-	   	else if ($img || $title) $ret.=$img.' '.$title;
-		$ret.='</a>';
-		$ret.='</label>';
-		$ret.='</div>';
-	}
 	$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).'">';
 	$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
-	if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+	$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
 	$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
-	if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.strip_tags($title).'"';		// Will work only if MAIN_HTML5_PLACEHOLDER is set to 1
-	else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
+	$ret.=' placeholder="'.strip_tags($title).'"';
 	$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.="</form>\n";

From 219364703fd2dcc20f4a135f5546dfdd51fa9b00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Nov 2017 10:48:21 +0100
Subject: [PATCH 62/86] Sync transifex

---
 htdocs/langs/ar_SA/accountancy.lang   |   2 +-
 htdocs/langs/ar_SA/admin.lang         |   7 +-
 htdocs/langs/ar_SA/commercial.lang    |   6 +
 htdocs/langs/ar_SA/holiday.lang       |   2 +
 htdocs/langs/ar_SA/mails.lang         |   1 -
 htdocs/langs/ar_SA/main.lang          |  10 ++
 htdocs/langs/ar_SA/members.lang       |   4 +-
 htdocs/langs/ar_SA/modulebuilder.lang |   3 +-
 htdocs/langs/ar_SA/products.lang      | 184 +++++++++++++-------------
 htdocs/langs/ar_SA/projects.lang      |   7 +-
 htdocs/langs/ar_SA/salaries.lang      |   2 +
 htdocs/langs/ar_SA/stocks.lang        |   2 +
 htdocs/langs/ar_SA/trips.lang         |   6 +-
 htdocs/langs/ar_SA/website.lang       |   9 +-
 htdocs/langs/bg_BG/admin.lang         |   7 +-
 htdocs/langs/bg_BG/commercial.lang    |   6 +
 htdocs/langs/bg_BG/holiday.lang       |   2 +
 htdocs/langs/bg_BG/mails.lang         |   1 -
 htdocs/langs/bg_BG/main.lang          |  10 ++
 htdocs/langs/bg_BG/members.lang       |   4 +-
 htdocs/langs/bg_BG/modulebuilder.lang |   3 +-
 htdocs/langs/bg_BG/projects.lang      |   7 +-
 htdocs/langs/bg_BG/salaries.lang      |   2 +
 htdocs/langs/bg_BG/stocks.lang        |   2 +
 htdocs/langs/bg_BG/trips.lang         |   6 +-
 htdocs/langs/bg_BG/website.lang       |   9 +-
 htdocs/langs/bn_BD/admin.lang         |   7 +-
 htdocs/langs/bn_BD/commercial.lang    |   6 +
 htdocs/langs/bn_BD/holiday.lang       |   2 +
 htdocs/langs/bn_BD/mails.lang         |   1 -
 htdocs/langs/bn_BD/main.lang          |  10 ++
 htdocs/langs/bn_BD/members.lang       |   4 +-
 htdocs/langs/bn_BD/modulebuilder.lang |   3 +-
 htdocs/langs/bn_BD/projects.lang      |   7 +-
 htdocs/langs/bn_BD/salaries.lang      |   2 +
 htdocs/langs/bn_BD/stocks.lang        |   2 +
 htdocs/langs/bn_BD/trips.lang         |   6 +-
 htdocs/langs/bn_BD/website.lang       |   9 +-
 htdocs/langs/bs_BA/admin.lang         |   7 +-
 htdocs/langs/bs_BA/commercial.lang    |   6 +
 htdocs/langs/bs_BA/holiday.lang       |   2 +
 htdocs/langs/bs_BA/mails.lang         |   1 -
 htdocs/langs/bs_BA/main.lang          |  10 ++
 htdocs/langs/bs_BA/members.lang       |   4 +-
 htdocs/langs/bs_BA/modulebuilder.lang |   3 +-
 htdocs/langs/bs_BA/projects.lang      |   7 +-
 htdocs/langs/bs_BA/salaries.lang      |   2 +
 htdocs/langs/bs_BA/stocks.lang        |   2 +
 htdocs/langs/bs_BA/trips.lang         |   6 +-
 htdocs/langs/bs_BA/website.lang       |   9 +-
 htdocs/langs/ca_ES/admin.lang         |   7 +-
 htdocs/langs/ca_ES/commercial.lang    |   6 +
 htdocs/langs/ca_ES/holiday.lang       |   2 +
 htdocs/langs/ca_ES/mails.lang         |   1 -
 htdocs/langs/ca_ES/main.lang          |  10 ++
 htdocs/langs/ca_ES/members.lang       |   4 +-
 htdocs/langs/ca_ES/modulebuilder.lang |   3 +-
 htdocs/langs/ca_ES/projects.lang      |   7 +-
 htdocs/langs/ca_ES/salaries.lang      |   2 +
 htdocs/langs/ca_ES/stocks.lang        |   2 +
 htdocs/langs/ca_ES/trips.lang         |   6 +-
 htdocs/langs/ca_ES/website.lang       |   9 +-
 htdocs/langs/cs_CZ/admin.lang         |   7 +-
 htdocs/langs/cs_CZ/commercial.lang    |   6 +
 htdocs/langs/cs_CZ/holiday.lang       |   2 +
 htdocs/langs/cs_CZ/mails.lang         |   1 -
 htdocs/langs/cs_CZ/main.lang          |  10 ++
 htdocs/langs/cs_CZ/members.lang       |   4 +-
 htdocs/langs/cs_CZ/modulebuilder.lang |   3 +-
 htdocs/langs/cs_CZ/projects.lang      |   7 +-
 htdocs/langs/cs_CZ/salaries.lang      |   2 +
 htdocs/langs/cs_CZ/stocks.lang        |   2 +
 htdocs/langs/cs_CZ/trips.lang         |   6 +-
 htdocs/langs/cs_CZ/website.lang       |   9 +-
 htdocs/langs/da_DK/admin.lang         |   7 +-
 htdocs/langs/da_DK/commercial.lang    |   6 +
 htdocs/langs/da_DK/holiday.lang       |   2 +
 htdocs/langs/da_DK/mails.lang         |   1 -
 htdocs/langs/da_DK/main.lang          |  10 ++
 htdocs/langs/da_DK/members.lang       |   4 +-
 htdocs/langs/da_DK/modulebuilder.lang |   3 +-
 htdocs/langs/da_DK/projects.lang      |   7 +-
 htdocs/langs/da_DK/salaries.lang      |   2 +
 htdocs/langs/da_DK/stocks.lang        |   2 +
 htdocs/langs/da_DK/trips.lang         |   6 +-
 htdocs/langs/da_DK/website.lang       |   9 +-
 htdocs/langs/de_AT/admin.lang         |   2 +
 htdocs/langs/de_CH/admin.lang         |   1 -
 htdocs/langs/de_CH/main.lang          |   2 +
 htdocs/langs/de_CH/trips.lang         |   1 -
 htdocs/langs/de_CH/website.lang       |   1 -
 htdocs/langs/de_DE/admin.lang         |   7 +-
 htdocs/langs/de_DE/commercial.lang    |   6 +
 htdocs/langs/de_DE/holiday.lang       |   2 +
 htdocs/langs/de_DE/mails.lang         |   1 -
 htdocs/langs/de_DE/main.lang          |  10 ++
 htdocs/langs/de_DE/members.lang       |   4 +-
 htdocs/langs/de_DE/modulebuilder.lang |   3 +-
 htdocs/langs/de_DE/projects.lang      |   7 +-
 htdocs/langs/de_DE/salaries.lang      |   2 +
 htdocs/langs/de_DE/stocks.lang        |   2 +
 htdocs/langs/de_DE/trips.lang         |   6 +-
 htdocs/langs/de_DE/website.lang       |   9 +-
 htdocs/langs/el_CY/admin.lang         |   2 +
 htdocs/langs/el_GR/admin.lang         |   7 +-
 htdocs/langs/el_GR/commercial.lang    |   6 +
 htdocs/langs/el_GR/holiday.lang       |   2 +
 htdocs/langs/el_GR/mails.lang         |   1 -
 htdocs/langs/el_GR/main.lang          |  10 ++
 htdocs/langs/el_GR/members.lang       |   4 +-
 htdocs/langs/el_GR/modulebuilder.lang |   3 +-
 htdocs/langs/el_GR/projects.lang      |   7 +-
 htdocs/langs/el_GR/salaries.lang      |   2 +
 htdocs/langs/el_GR/stocks.lang        |   2 +
 htdocs/langs/el_GR/trips.lang         |   6 +-
 htdocs/langs/el_GR/website.lang       |   9 +-
 htdocs/langs/en_AU/admin.lang         |   4 +
 htdocs/langs/en_CA/admin.lang         |   4 +
 htdocs/langs/en_GB/admin.lang         |   4 +
 htdocs/langs/en_GB/bills.lang         |  20 ++-
 htdocs/langs/en_GB/main.lang          |   1 +
 htdocs/langs/en_GB/website.lang       |   1 -
 htdocs/langs/en_IN/admin.lang         |   4 +
 htdocs/langs/es_AR/admin.lang         |   4 +
 htdocs/langs/es_BO/admin.lang         |   4 +
 htdocs/langs/es_CL/admin.lang         |   4 +
 htdocs/langs/es_CO/admin.lang         |   4 +
 htdocs/langs/es_DO/admin.lang         |   4 +
 htdocs/langs/es_EC/admin.lang         |   5 +-
 htdocs/langs/es_EC/main.lang          |   6 +
 htdocs/langs/es_ES/admin.lang         |  17 +--
 htdocs/langs/es_ES/commercial.lang    |   6 +
 htdocs/langs/es_ES/holiday.lang       |   2 +
 htdocs/langs/es_ES/mails.lang         |   3 +-
 htdocs/langs/es_ES/main.lang          |  10 ++
 htdocs/langs/es_ES/members.lang       |   4 +-
 htdocs/langs/es_ES/modulebuilder.lang |   3 +-
 htdocs/langs/es_ES/other.lang         |   8 +-
 htdocs/langs/es_ES/projects.lang      |   7 +-
 htdocs/langs/es_ES/salaries.lang      |   2 +
 htdocs/langs/es_ES/stocks.lang        |   2 +
 htdocs/langs/es_ES/trips.lang         |   6 +-
 htdocs/langs/es_ES/website.lang       |   9 +-
 htdocs/langs/es_MX/admin.lang         |   4 +
 htdocs/langs/es_MX/main.lang          |   1 +
 htdocs/langs/es_MX/trips.lang         |   1 -
 htdocs/langs/es_PA/admin.lang         |   4 +
 htdocs/langs/es_PE/accountancy.lang   |  11 +-
 htdocs/langs/es_PE/admin.lang         |   4 +
 htdocs/langs/es_PE/bills.lang         |   1 +
 htdocs/langs/es_PE/companies.lang     |   1 +
 htdocs/langs/es_PE/main.lang          |   2 +
 htdocs/langs/es_PE/propal.lang        |   1 +
 htdocs/langs/es_PY/admin.lang         |   4 +
 htdocs/langs/es_VE/admin.lang         |   2 +
 htdocs/langs/es_VE/main.lang          |   1 +
 htdocs/langs/et_EE/admin.lang         |   7 +-
 htdocs/langs/et_EE/commercial.lang    |   6 +
 htdocs/langs/et_EE/holiday.lang       |   2 +
 htdocs/langs/et_EE/mails.lang         |   1 -
 htdocs/langs/et_EE/main.lang          |  10 ++
 htdocs/langs/et_EE/members.lang       |   4 +-
 htdocs/langs/et_EE/modulebuilder.lang |   3 +-
 htdocs/langs/et_EE/projects.lang      |   7 +-
 htdocs/langs/et_EE/salaries.lang      |   2 +
 htdocs/langs/et_EE/stocks.lang        |   2 +
 htdocs/langs/et_EE/trips.lang         |   6 +-
 htdocs/langs/et_EE/website.lang       |   9 +-
 htdocs/langs/eu_ES/admin.lang         |   7 +-
 htdocs/langs/eu_ES/commercial.lang    |   6 +
 htdocs/langs/eu_ES/holiday.lang       |   2 +
 htdocs/langs/eu_ES/mails.lang         |   1 -
 htdocs/langs/eu_ES/main.lang          |  10 ++
 htdocs/langs/eu_ES/members.lang       |   4 +-
 htdocs/langs/eu_ES/modulebuilder.lang |   3 +-
 htdocs/langs/eu_ES/projects.lang      |   7 +-
 htdocs/langs/eu_ES/salaries.lang      |   2 +
 htdocs/langs/eu_ES/stocks.lang        |   2 +
 htdocs/langs/eu_ES/trips.lang         |   6 +-
 htdocs/langs/eu_ES/website.lang       |   9 +-
 htdocs/langs/fa_IR/admin.lang         |   7 +-
 htdocs/langs/fa_IR/commercial.lang    |   6 +
 htdocs/langs/fa_IR/holiday.lang       |   2 +
 htdocs/langs/fa_IR/mails.lang         |   1 -
 htdocs/langs/fa_IR/main.lang          |  10 ++
 htdocs/langs/fa_IR/members.lang       |   4 +-
 htdocs/langs/fa_IR/modulebuilder.lang |   3 +-
 htdocs/langs/fa_IR/projects.lang      |   7 +-
 htdocs/langs/fa_IR/salaries.lang      |   2 +
 htdocs/langs/fa_IR/stocks.lang        |   2 +
 htdocs/langs/fa_IR/trips.lang         |   6 +-
 htdocs/langs/fa_IR/website.lang       |   9 +-
 htdocs/langs/fi_FI/admin.lang         |   7 +-
 htdocs/langs/fi_FI/commercial.lang    |   6 +
 htdocs/langs/fi_FI/holiday.lang       |   2 +
 htdocs/langs/fi_FI/mails.lang         |   1 -
 htdocs/langs/fi_FI/main.lang          |  10 ++
 htdocs/langs/fi_FI/members.lang       |   4 +-
 htdocs/langs/fi_FI/modulebuilder.lang |   3 +-
 htdocs/langs/fi_FI/projects.lang      |   7 +-
 htdocs/langs/fi_FI/salaries.lang      |   2 +
 htdocs/langs/fi_FI/stocks.lang        |   2 +
 htdocs/langs/fi_FI/trips.lang         |   6 +-
 htdocs/langs/fi_FI/website.lang       |   9 +-
 htdocs/langs/fr_BE/admin.lang         |   3 +
 htdocs/langs/fr_CA/admin.lang         |   4 +-
 htdocs/langs/fr_CA/mails.lang         |   1 -
 htdocs/langs/fr_CA/main.lang          |   2 +
 htdocs/langs/fr_CA/members.lang       |   1 -
 htdocs/langs/fr_CA/other.lang         |   1 -
 htdocs/langs/fr_CA/trips.lang         |   2 -
 htdocs/langs/fr_CA/website.lang       |   1 -
 htdocs/langs/fr_CH/admin.lang         |   3 +
 htdocs/langs/fr_FR/accountancy.lang   |   2 +-
 htdocs/langs/fr_FR/admin.lang         |  57 ++++----
 htdocs/langs/fr_FR/agenda.lang        |   2 +-
 htdocs/langs/fr_FR/banks.lang         |   2 +-
 htdocs/langs/fr_FR/bills.lang         |  12 +-
 htdocs/langs/fr_FR/commercial.lang    |   6 +
 htdocs/langs/fr_FR/companies.lang     |   2 +-
 htdocs/langs/fr_FR/compta.lang        |  10 +-
 htdocs/langs/fr_FR/contracts.lang     |   6 +-
 htdocs/langs/fr_FR/cron.lang          |   4 +-
 htdocs/langs/fr_FR/errors.lang        |   2 +-
 htdocs/langs/fr_FR/holiday.lang       |   2 +
 htdocs/langs/fr_FR/ldap.lang          |   2 +-
 htdocs/langs/fr_FR/mails.lang         |   5 +-
 htdocs/langs/fr_FR/main.lang          |  26 ++--
 htdocs/langs/fr_FR/members.lang       |  10 +-
 htdocs/langs/fr_FR/modulebuilder.lang |  17 +--
 htdocs/langs/fr_FR/other.lang         |  14 +-
 htdocs/langs/fr_FR/paypal.lang        |   2 +-
 htdocs/langs/fr_FR/products.lang      |   2 +-
 htdocs/langs/fr_FR/projects.lang      |   9 +-
 htdocs/langs/fr_FR/salaries.lang      |   4 +-
 htdocs/langs/fr_FR/sendings.lang      |   4 +-
 htdocs/langs/fr_FR/stocks.lang        |   4 +-
 htdocs/langs/fr_FR/stripe.lang        |   2 +-
 htdocs/langs/fr_FR/trips.lang         |  10 +-
 htdocs/langs/fr_FR/website.lang       |  17 ++-
 htdocs/langs/fr_FR/withdrawals.lang   |   4 +-
 htdocs/langs/he_IL/admin.lang         |   7 +-
 htdocs/langs/he_IL/commercial.lang    |   6 +
 htdocs/langs/he_IL/holiday.lang       |   2 +
 htdocs/langs/he_IL/mails.lang         |   1 -
 htdocs/langs/he_IL/main.lang          |  10 ++
 htdocs/langs/he_IL/members.lang       |   4 +-
 htdocs/langs/he_IL/modulebuilder.lang |   3 +-
 htdocs/langs/he_IL/projects.lang      |   7 +-
 htdocs/langs/he_IL/salaries.lang      |   2 +
 htdocs/langs/he_IL/stocks.lang        |   2 +
 htdocs/langs/he_IL/trips.lang         |   6 +-
 htdocs/langs/he_IL/website.lang       |   9 +-
 htdocs/langs/hr_HR/admin.lang         |   7 +-
 htdocs/langs/hr_HR/commercial.lang    |   6 +
 htdocs/langs/hr_HR/holiday.lang       |   2 +
 htdocs/langs/hr_HR/mails.lang         |   1 -
 htdocs/langs/hr_HR/main.lang          |  10 ++
 htdocs/langs/hr_HR/members.lang       |   4 +-
 htdocs/langs/hr_HR/modulebuilder.lang |   3 +-
 htdocs/langs/hr_HR/projects.lang      |   7 +-
 htdocs/langs/hr_HR/salaries.lang      |   2 +
 htdocs/langs/hr_HR/stocks.lang        |   2 +
 htdocs/langs/hr_HR/trips.lang         |   6 +-
 htdocs/langs/hr_HR/website.lang       |   9 +-
 htdocs/langs/hu_HU/admin.lang         |   7 +-
 htdocs/langs/hu_HU/commercial.lang    |   6 +
 htdocs/langs/hu_HU/holiday.lang       |   2 +
 htdocs/langs/hu_HU/mails.lang         |   1 -
 htdocs/langs/hu_HU/main.lang          |  10 ++
 htdocs/langs/hu_HU/members.lang       |   4 +-
 htdocs/langs/hu_HU/modulebuilder.lang |   3 +-
 htdocs/langs/hu_HU/projects.lang      |   7 +-
 htdocs/langs/hu_HU/salaries.lang      |   2 +
 htdocs/langs/hu_HU/stocks.lang        |   2 +
 htdocs/langs/hu_HU/trips.lang         |   6 +-
 htdocs/langs/hu_HU/website.lang       |   9 +-
 htdocs/langs/id_ID/admin.lang         |   7 +-
 htdocs/langs/id_ID/commercial.lang    |   6 +
 htdocs/langs/id_ID/holiday.lang       |   2 +
 htdocs/langs/id_ID/mails.lang         |   1 -
 htdocs/langs/id_ID/main.lang          |  10 ++
 htdocs/langs/id_ID/members.lang       |   4 +-
 htdocs/langs/id_ID/modulebuilder.lang |   3 +-
 htdocs/langs/id_ID/projects.lang      |   7 +-
 htdocs/langs/id_ID/salaries.lang      |   2 +
 htdocs/langs/id_ID/stocks.lang        |   2 +
 htdocs/langs/id_ID/trips.lang         |   6 +-
 htdocs/langs/id_ID/website.lang       |   9 +-
 htdocs/langs/is_IS/admin.lang         |   7 +-
 htdocs/langs/is_IS/commercial.lang    |   6 +
 htdocs/langs/is_IS/holiday.lang       |   2 +
 htdocs/langs/is_IS/mails.lang         |   1 -
 htdocs/langs/is_IS/main.lang          |  10 ++
 htdocs/langs/is_IS/members.lang       |   4 +-
 htdocs/langs/is_IS/modulebuilder.lang |   3 +-
 htdocs/langs/is_IS/projects.lang      |   7 +-
 htdocs/langs/is_IS/salaries.lang      |   2 +
 htdocs/langs/is_IS/stocks.lang        |   2 +
 htdocs/langs/is_IS/trips.lang         |   6 +-
 htdocs/langs/is_IS/website.lang       |   9 +-
 htdocs/langs/it_IT/admin.lang         |   7 +-
 htdocs/langs/it_IT/commercial.lang    |   6 +
 htdocs/langs/it_IT/holiday.lang       |   2 +
 htdocs/langs/it_IT/mails.lang         |   1 -
 htdocs/langs/it_IT/main.lang          |  10 ++
 htdocs/langs/it_IT/members.lang       |   4 +-
 htdocs/langs/it_IT/modulebuilder.lang |   3 +-
 htdocs/langs/it_IT/projects.lang      |   7 +-
 htdocs/langs/it_IT/salaries.lang      |   2 +
 htdocs/langs/it_IT/stocks.lang        |   2 +
 htdocs/langs/it_IT/trips.lang         |   6 +-
 htdocs/langs/it_IT/website.lang       |   9 +-
 htdocs/langs/ja_JP/admin.lang         |   7 +-
 htdocs/langs/ja_JP/commercial.lang    |   6 +
 htdocs/langs/ja_JP/holiday.lang       |   2 +
 htdocs/langs/ja_JP/mails.lang         |   1 -
 htdocs/langs/ja_JP/main.lang          |  10 ++
 htdocs/langs/ja_JP/members.lang       |   4 +-
 htdocs/langs/ja_JP/modulebuilder.lang |   3 +-
 htdocs/langs/ja_JP/projects.lang      |   7 +-
 htdocs/langs/ja_JP/salaries.lang      |   2 +
 htdocs/langs/ja_JP/stocks.lang        |   2 +
 htdocs/langs/ja_JP/trips.lang         |   6 +-
 htdocs/langs/ja_JP/website.lang       |   9 +-
 htdocs/langs/ka_GE/admin.lang         |   7 +-
 htdocs/langs/ka_GE/commercial.lang    |   6 +
 htdocs/langs/ka_GE/holiday.lang       |   2 +
 htdocs/langs/ka_GE/mails.lang         |   1 -
 htdocs/langs/ka_GE/main.lang          |  10 ++
 htdocs/langs/ka_GE/members.lang       |   4 +-
 htdocs/langs/ka_GE/modulebuilder.lang |   3 +-
 htdocs/langs/ka_GE/projects.lang      |   7 +-
 htdocs/langs/ka_GE/salaries.lang      |   2 +
 htdocs/langs/ka_GE/stocks.lang        |   2 +
 htdocs/langs/ka_GE/trips.lang         |   6 +-
 htdocs/langs/ka_GE/website.lang       |   9 +-
 htdocs/langs/km_KH/admin.lang         |   7 +-
 htdocs/langs/km_KH/commercial.lang    |   6 +
 htdocs/langs/km_KH/holiday.lang       |   2 +
 htdocs/langs/km_KH/mails.lang         |   1 -
 htdocs/langs/km_KH/main.lang          |  10 ++
 htdocs/langs/km_KH/members.lang       |   4 +-
 htdocs/langs/km_KH/modulebuilder.lang |   3 +-
 htdocs/langs/km_KH/projects.lang      |   7 +-
 htdocs/langs/km_KH/salaries.lang      |   2 +
 htdocs/langs/km_KH/stocks.lang        |   2 +
 htdocs/langs/km_KH/trips.lang         |   6 +-
 htdocs/langs/km_KH/website.lang       |   9 +-
 htdocs/langs/kn_IN/admin.lang         |   7 +-
 htdocs/langs/kn_IN/commercial.lang    |   6 +
 htdocs/langs/kn_IN/holiday.lang       |   2 +
 htdocs/langs/kn_IN/mails.lang         |   1 -
 htdocs/langs/kn_IN/main.lang          |  10 ++
 htdocs/langs/kn_IN/members.lang       |   4 +-
 htdocs/langs/kn_IN/modulebuilder.lang |   3 +-
 htdocs/langs/kn_IN/projects.lang      |   7 +-
 htdocs/langs/kn_IN/salaries.lang      |   2 +
 htdocs/langs/kn_IN/stocks.lang        |   2 +
 htdocs/langs/kn_IN/trips.lang         |   6 +-
 htdocs/langs/kn_IN/website.lang       |   9 +-
 htdocs/langs/ko_KR/admin.lang         |   7 +-
 htdocs/langs/ko_KR/commercial.lang    |   6 +
 htdocs/langs/ko_KR/holiday.lang       |   2 +
 htdocs/langs/ko_KR/mails.lang         |   1 -
 htdocs/langs/ko_KR/main.lang          |  10 ++
 htdocs/langs/ko_KR/members.lang       |   4 +-
 htdocs/langs/ko_KR/modulebuilder.lang |   3 +-
 htdocs/langs/ko_KR/projects.lang      |   7 +-
 htdocs/langs/ko_KR/salaries.lang      |   2 +
 htdocs/langs/ko_KR/stocks.lang        |   2 +
 htdocs/langs/ko_KR/trips.lang         |   6 +-
 htdocs/langs/ko_KR/website.lang       |   9 +-
 htdocs/langs/lo_LA/admin.lang         |   7 +-
 htdocs/langs/lo_LA/commercial.lang    |   6 +
 htdocs/langs/lo_LA/holiday.lang       |   2 +
 htdocs/langs/lo_LA/mails.lang         |   1 -
 htdocs/langs/lo_LA/main.lang          |  10 ++
 htdocs/langs/lo_LA/members.lang       |   4 +-
 htdocs/langs/lo_LA/modulebuilder.lang |   3 +-
 htdocs/langs/lo_LA/projects.lang      |   7 +-
 htdocs/langs/lo_LA/salaries.lang      |   2 +
 htdocs/langs/lo_LA/stocks.lang        |   2 +
 htdocs/langs/lo_LA/trips.lang         |   6 +-
 htdocs/langs/lo_LA/website.lang       |   9 +-
 htdocs/langs/lt_LT/admin.lang         |   7 +-
 htdocs/langs/lt_LT/commercial.lang    |   6 +
 htdocs/langs/lt_LT/holiday.lang       |   2 +
 htdocs/langs/lt_LT/mails.lang         |   1 -
 htdocs/langs/lt_LT/main.lang          |  10 ++
 htdocs/langs/lt_LT/members.lang       |   4 +-
 htdocs/langs/lt_LT/modulebuilder.lang |   3 +-
 htdocs/langs/lt_LT/projects.lang      |   7 +-
 htdocs/langs/lt_LT/salaries.lang      |   2 +
 htdocs/langs/lt_LT/stocks.lang        |   2 +
 htdocs/langs/lt_LT/trips.lang         |   6 +-
 htdocs/langs/lt_LT/website.lang       |   9 +-
 htdocs/langs/lv_LV/admin.lang         |  11 +-
 htdocs/langs/lv_LV/commercial.lang    |   6 +
 htdocs/langs/lv_LV/holiday.lang       |   2 +
 htdocs/langs/lv_LV/mails.lang         |   1 -
 htdocs/langs/lv_LV/main.lang          |  10 ++
 htdocs/langs/lv_LV/members.lang       |   4 +-
 htdocs/langs/lv_LV/modulebuilder.lang |   3 +-
 htdocs/langs/lv_LV/projects.lang      |   7 +-
 htdocs/langs/lv_LV/salaries.lang      |   2 +
 htdocs/langs/lv_LV/stocks.lang        |   2 +
 htdocs/langs/lv_LV/trips.lang         |   6 +-
 htdocs/langs/lv_LV/website.lang       |   9 +-
 htdocs/langs/mk_MK/admin.lang         |   7 +-
 htdocs/langs/mk_MK/commercial.lang    |   6 +
 htdocs/langs/mk_MK/holiday.lang       |   2 +
 htdocs/langs/mk_MK/mails.lang         |   1 -
 htdocs/langs/mk_MK/main.lang          |  10 ++
 htdocs/langs/mk_MK/members.lang       |   4 +-
 htdocs/langs/mk_MK/modulebuilder.lang |   3 +-
 htdocs/langs/mk_MK/projects.lang      |   7 +-
 htdocs/langs/mk_MK/salaries.lang      |   2 +
 htdocs/langs/mk_MK/stocks.lang        |   2 +
 htdocs/langs/mk_MK/trips.lang         |   6 +-
 htdocs/langs/mk_MK/website.lang       |   9 +-
 htdocs/langs/mn_MN/admin.lang         |   7 +-
 htdocs/langs/mn_MN/commercial.lang    |   6 +
 htdocs/langs/mn_MN/holiday.lang       |   2 +
 htdocs/langs/mn_MN/mails.lang         |   1 -
 htdocs/langs/mn_MN/main.lang          |  10 ++
 htdocs/langs/mn_MN/members.lang       |   4 +-
 htdocs/langs/mn_MN/modulebuilder.lang |   3 +-
 htdocs/langs/mn_MN/projects.lang      |   7 +-
 htdocs/langs/mn_MN/salaries.lang      |   2 +
 htdocs/langs/mn_MN/stocks.lang        |   2 +
 htdocs/langs/mn_MN/trips.lang         |   6 +-
 htdocs/langs/mn_MN/website.lang       |   9 +-
 htdocs/langs/nb_NO/accountancy.lang   |   2 +-
 htdocs/langs/nb_NO/admin.lang         |  83 ++++++------
 htdocs/langs/nb_NO/agenda.lang        |   2 +-
 htdocs/langs/nb_NO/banks.lang         |   4 +-
 htdocs/langs/nb_NO/bills.lang         |   2 +-
 htdocs/langs/nb_NO/commercial.lang    |   6 +
 htdocs/langs/nb_NO/companies.lang     |   4 +-
 htdocs/langs/nb_NO/contracts.lang     |   4 +-
 htdocs/langs/nb_NO/errors.lang        |   4 +-
 htdocs/langs/nb_NO/holiday.lang       |   2 +
 htdocs/langs/nb_NO/interventions.lang |   2 +-
 htdocs/langs/nb_NO/ldap.lang          |   4 +-
 htdocs/langs/nb_NO/mails.lang         |  11 +-
 htdocs/langs/nb_NO/main.lang          |  24 +++-
 htdocs/langs/nb_NO/members.lang       |  14 +-
 htdocs/langs/nb_NO/modulebuilder.lang |  41 +++---
 htdocs/langs/nb_NO/multicurrency.lang |   2 +-
 htdocs/langs/nb_NO/opensurvey.lang    |   2 +-
 htdocs/langs/nb_NO/other.lang         |  28 ++--
 htdocs/langs/nb_NO/products.lang      |   2 +-
 htdocs/langs/nb_NO/projects.lang      |   9 +-
 htdocs/langs/nb_NO/salaries.lang      |   2 +
 htdocs/langs/nb_NO/stocks.lang        |   2 +
 htdocs/langs/nb_NO/trips.lang         |   6 +-
 htdocs/langs/nb_NO/users.lang         |   4 +-
 htdocs/langs/nb_NO/website.lang       |  13 +-
 htdocs/langs/nb_NO/withdrawals.lang   |   2 +-
 htdocs/langs/nl_BE/main.lang          |   2 +
 htdocs/langs/nl_BE/website.lang       |   1 -
 htdocs/langs/nl_NL/admin.lang         |   7 +-
 htdocs/langs/nl_NL/commercial.lang    |   6 +
 htdocs/langs/nl_NL/holiday.lang       |   2 +
 htdocs/langs/nl_NL/mails.lang         |   1 -
 htdocs/langs/nl_NL/main.lang          |  10 ++
 htdocs/langs/nl_NL/members.lang       |   4 +-
 htdocs/langs/nl_NL/modulebuilder.lang |   3 +-
 htdocs/langs/nl_NL/projects.lang      |   7 +-
 htdocs/langs/nl_NL/salaries.lang      |   2 +
 htdocs/langs/nl_NL/stocks.lang        |   2 +
 htdocs/langs/nl_NL/trips.lang         |   6 +-
 htdocs/langs/nl_NL/website.lang       |   9 +-
 htdocs/langs/pl_PL/admin.lang         |   7 +-
 htdocs/langs/pl_PL/commercial.lang    |   6 +
 htdocs/langs/pl_PL/holiday.lang       |   2 +
 htdocs/langs/pl_PL/mails.lang         |   1 -
 htdocs/langs/pl_PL/main.lang          |  10 ++
 htdocs/langs/pl_PL/members.lang       |   4 +-
 htdocs/langs/pl_PL/modulebuilder.lang |   3 +-
 htdocs/langs/pl_PL/projects.lang      |   7 +-
 htdocs/langs/pl_PL/salaries.lang      |   2 +
 htdocs/langs/pl_PL/stocks.lang        |   2 +
 htdocs/langs/pl_PL/trips.lang         |   6 +-
 htdocs/langs/pl_PL/website.lang       |   9 +-
 htdocs/langs/pt_BR/accountancy.lang   |   1 -
 htdocs/langs/pt_BR/admin.lang         |  14 --
 htdocs/langs/pt_BR/commercial.lang    |   1 -
 htdocs/langs/pt_BR/main.lang          |   2 +-
 htdocs/langs/pt_BR/members.lang       |   2 -
 htdocs/langs/pt_BR/products.lang      |   1 -
 htdocs/langs/pt_BR/projects.lang      |   1 +
 htdocs/langs/pt_BR/trips.lang         |   2 +-
 htdocs/langs/pt_BR/website.lang       |   1 -
 htdocs/langs/pt_PT/accountancy.lang   |   2 +-
 htdocs/langs/pt_PT/admin.lang         | 121 +++++++++--------
 htdocs/langs/pt_PT/agenda.lang        |  20 +--
 htdocs/langs/pt_PT/boxes.lang         |   2 +-
 htdocs/langs/pt_PT/commercial.lang    |   6 +
 htdocs/langs/pt_PT/companies.lang     |   6 +-
 htdocs/langs/pt_PT/contracts.lang     |  10 +-
 htdocs/langs/pt_PT/ecm.lang           |  10 +-
 htdocs/langs/pt_PT/holiday.lang       |   2 +
 htdocs/langs/pt_PT/install.lang       |   4 +-
 htdocs/langs/pt_PT/ldap.lang          |   4 +-
 htdocs/langs/pt_PT/mails.lang         |   1 -
 htdocs/langs/pt_PT/main.lang          | 110 ++++++++-------
 htdocs/langs/pt_PT/members.lang       |   4 +-
 htdocs/langs/pt_PT/modulebuilder.lang |   3 +-
 htdocs/langs/pt_PT/multicurrency.lang |  10 +-
 htdocs/langs/pt_PT/paybox.lang        |   2 +-
 htdocs/langs/pt_PT/paypal.lang        |   6 +-
 htdocs/langs/pt_PT/products.lang      |  56 ++++----
 htdocs/langs/pt_PT/projects.lang      |   9 +-
 htdocs/langs/pt_PT/salaries.lang      |   4 +-
 htdocs/langs/pt_PT/sms.lang           |   2 +-
 htdocs/langs/pt_PT/stocks.lang        |   2 +
 htdocs/langs/pt_PT/stripe.lang        |   4 +-
 htdocs/langs/pt_PT/suppliers.lang     |   4 +-
 htdocs/langs/pt_PT/trips.lang         |   6 +-
 htdocs/langs/pt_PT/users.lang         |   6 +-
 htdocs/langs/pt_PT/website.lang       |   9 +-
 htdocs/langs/ro_RO/admin.lang         |   7 +-
 htdocs/langs/ro_RO/commercial.lang    |   6 +
 htdocs/langs/ro_RO/holiday.lang       |   2 +
 htdocs/langs/ro_RO/mails.lang         |   1 -
 htdocs/langs/ro_RO/main.lang          |  10 ++
 htdocs/langs/ro_RO/members.lang       |   4 +-
 htdocs/langs/ro_RO/modulebuilder.lang |   3 +-
 htdocs/langs/ro_RO/projects.lang      |   7 +-
 htdocs/langs/ro_RO/salaries.lang      |   2 +
 htdocs/langs/ro_RO/stocks.lang        |   2 +
 htdocs/langs/ro_RO/trips.lang         |   6 +-
 htdocs/langs/ro_RO/website.lang       |   9 +-
 htdocs/langs/ru_RU/admin.lang         |   7 +-
 htdocs/langs/ru_RU/commercial.lang    |   6 +
 htdocs/langs/ru_RU/holiday.lang       |   2 +
 htdocs/langs/ru_RU/mails.lang         |   1 -
 htdocs/langs/ru_RU/main.lang          |  10 ++
 htdocs/langs/ru_RU/members.lang       |   4 +-
 htdocs/langs/ru_RU/modulebuilder.lang |   3 +-
 htdocs/langs/ru_RU/projects.lang      |   7 +-
 htdocs/langs/ru_RU/salaries.lang      |   2 +
 htdocs/langs/ru_RU/stocks.lang        |   2 +
 htdocs/langs/ru_RU/trips.lang         |   6 +-
 htdocs/langs/ru_RU/website.lang       |   9 +-
 htdocs/langs/sk_SK/admin.lang         |   7 +-
 htdocs/langs/sk_SK/commercial.lang    |   6 +
 htdocs/langs/sk_SK/holiday.lang       |   2 +
 htdocs/langs/sk_SK/mails.lang         |   1 -
 htdocs/langs/sk_SK/main.lang          |  10 ++
 htdocs/langs/sk_SK/members.lang       |   4 +-
 htdocs/langs/sk_SK/modulebuilder.lang |   3 +-
 htdocs/langs/sk_SK/projects.lang      |   7 +-
 htdocs/langs/sk_SK/salaries.lang      |   2 +
 htdocs/langs/sk_SK/stocks.lang        |   2 +
 htdocs/langs/sk_SK/trips.lang         |   6 +-
 htdocs/langs/sk_SK/website.lang       |   9 +-
 htdocs/langs/sl_SI/admin.lang         |   7 +-
 htdocs/langs/sl_SI/commercial.lang    |   6 +
 htdocs/langs/sl_SI/holiday.lang       |   2 +
 htdocs/langs/sl_SI/mails.lang         |   1 -
 htdocs/langs/sl_SI/main.lang          |  10 ++
 htdocs/langs/sl_SI/members.lang       |   4 +-
 htdocs/langs/sl_SI/modulebuilder.lang |   3 +-
 htdocs/langs/sl_SI/projects.lang      |   7 +-
 htdocs/langs/sl_SI/salaries.lang      |   2 +
 htdocs/langs/sl_SI/stocks.lang        |   2 +
 htdocs/langs/sl_SI/trips.lang         |   6 +-
 htdocs/langs/sl_SI/website.lang       |   9 +-
 htdocs/langs/sq_AL/admin.lang         |   7 +-
 htdocs/langs/sq_AL/commercial.lang    |   6 +
 htdocs/langs/sq_AL/holiday.lang       |   2 +
 htdocs/langs/sq_AL/mails.lang         |   1 -
 htdocs/langs/sq_AL/main.lang          |  10 ++
 htdocs/langs/sq_AL/members.lang       |   4 +-
 htdocs/langs/sq_AL/modulebuilder.lang |   3 +-
 htdocs/langs/sq_AL/projects.lang      |   7 +-
 htdocs/langs/sq_AL/salaries.lang      |   2 +
 htdocs/langs/sq_AL/stocks.lang        |   2 +
 htdocs/langs/sq_AL/trips.lang         |   6 +-
 htdocs/langs/sq_AL/website.lang       |   9 +-
 htdocs/langs/sr_RS/admin.lang         |   7 +-
 htdocs/langs/sr_RS/commercial.lang    |   6 +
 htdocs/langs/sr_RS/holiday.lang       |   2 +
 htdocs/langs/sr_RS/mails.lang         |   1 -
 htdocs/langs/sr_RS/main.lang          |  10 ++
 htdocs/langs/sr_RS/members.lang       |   4 +-
 htdocs/langs/sr_RS/projects.lang      |   7 +-
 htdocs/langs/sr_RS/salaries.lang      |   2 +
 htdocs/langs/sr_RS/stocks.lang        |   2 +
 htdocs/langs/sr_RS/trips.lang         |   6 +-
 htdocs/langs/sv_SE/admin.lang         |   7 +-
 htdocs/langs/sv_SE/commercial.lang    |   6 +
 htdocs/langs/sv_SE/holiday.lang       |   2 +
 htdocs/langs/sv_SE/mails.lang         |   1 -
 htdocs/langs/sv_SE/main.lang          |  10 ++
 htdocs/langs/sv_SE/members.lang       |   4 +-
 htdocs/langs/sv_SE/modulebuilder.lang |   3 +-
 htdocs/langs/sv_SE/projects.lang      |   7 +-
 htdocs/langs/sv_SE/salaries.lang      |   2 +
 htdocs/langs/sv_SE/stocks.lang        |   2 +
 htdocs/langs/sv_SE/trips.lang         |   6 +-
 htdocs/langs/sv_SE/website.lang       |   9 +-
 htdocs/langs/sw_SW/admin.lang         |   7 +-
 htdocs/langs/sw_SW/commercial.lang    |   6 +
 htdocs/langs/sw_SW/holiday.lang       |   2 +
 htdocs/langs/sw_SW/mails.lang         |   1 -
 htdocs/langs/sw_SW/main.lang          |  10 ++
 htdocs/langs/sw_SW/members.lang       |   4 +-
 htdocs/langs/sw_SW/projects.lang      |   7 +-
 htdocs/langs/sw_SW/salaries.lang      |   2 +
 htdocs/langs/sw_SW/stocks.lang        |   2 +
 htdocs/langs/sw_SW/trips.lang         |   6 +-
 htdocs/langs/th_TH/admin.lang         |   7 +-
 htdocs/langs/th_TH/commercial.lang    |   6 +
 htdocs/langs/th_TH/holiday.lang       |   2 +
 htdocs/langs/th_TH/mails.lang         |   1 -
 htdocs/langs/th_TH/main.lang          |  10 ++
 htdocs/langs/th_TH/members.lang       |   4 +-
 htdocs/langs/th_TH/modulebuilder.lang |   3 +-
 htdocs/langs/th_TH/projects.lang      |   7 +-
 htdocs/langs/th_TH/salaries.lang      |   2 +
 htdocs/langs/th_TH/stocks.lang        |   2 +
 htdocs/langs/th_TH/trips.lang         |   6 +-
 htdocs/langs/th_TH/website.lang       |   9 +-
 htdocs/langs/tr_TR/admin.lang         |   7 +-
 htdocs/langs/tr_TR/commercial.lang    |   6 +
 htdocs/langs/tr_TR/holiday.lang       |   2 +
 htdocs/langs/tr_TR/mails.lang         |   1 -
 htdocs/langs/tr_TR/main.lang          |  10 ++
 htdocs/langs/tr_TR/members.lang       |   4 +-
 htdocs/langs/tr_TR/modulebuilder.lang |   3 +-
 htdocs/langs/tr_TR/projects.lang      |   7 +-
 htdocs/langs/tr_TR/salaries.lang      |   2 +
 htdocs/langs/tr_TR/stocks.lang        |   2 +
 htdocs/langs/tr_TR/trips.lang         |   6 +-
 htdocs/langs/tr_TR/website.lang       |   9 +-
 htdocs/langs/uk_UA/admin.lang         |   7 +-
 htdocs/langs/uk_UA/commercial.lang    |   6 +
 htdocs/langs/uk_UA/holiday.lang       |   2 +
 htdocs/langs/uk_UA/mails.lang         |   1 -
 htdocs/langs/uk_UA/main.lang          |  10 ++
 htdocs/langs/uk_UA/members.lang       |   4 +-
 htdocs/langs/uk_UA/modulebuilder.lang |   3 +-
 htdocs/langs/uk_UA/projects.lang      |   7 +-
 htdocs/langs/uk_UA/salaries.lang      |   2 +
 htdocs/langs/uk_UA/stocks.lang        |   2 +
 htdocs/langs/uk_UA/trips.lang         |   6 +-
 htdocs/langs/uk_UA/website.lang       |   9 +-
 htdocs/langs/uz_UZ/admin.lang         |   7 +-
 htdocs/langs/uz_UZ/commercial.lang    |   6 +
 htdocs/langs/uz_UZ/holiday.lang       |   2 +
 htdocs/langs/uz_UZ/mails.lang         |   1 -
 htdocs/langs/uz_UZ/main.lang          |  10 ++
 htdocs/langs/uz_UZ/members.lang       |   4 +-
 htdocs/langs/uz_UZ/projects.lang      |   7 +-
 htdocs/langs/uz_UZ/salaries.lang      |   2 +
 htdocs/langs/uz_UZ/stocks.lang        |   2 +
 htdocs/langs/uz_UZ/trips.lang         |   6 +-
 htdocs/langs/vi_VN/admin.lang         |   7 +-
 htdocs/langs/vi_VN/commercial.lang    |   6 +
 htdocs/langs/vi_VN/holiday.lang       |   2 +
 htdocs/langs/vi_VN/mails.lang         |   1 -
 htdocs/langs/vi_VN/main.lang          |  10 ++
 htdocs/langs/vi_VN/members.lang       |   4 +-
 htdocs/langs/vi_VN/modulebuilder.lang |   3 +-
 htdocs/langs/vi_VN/projects.lang      |   7 +-
 htdocs/langs/vi_VN/salaries.lang      |   2 +
 htdocs/langs/vi_VN/stocks.lang        |   2 +
 htdocs/langs/vi_VN/trips.lang         |   6 +-
 htdocs/langs/vi_VN/website.lang       |   9 +-
 htdocs/langs/zh_CN/admin.lang         |   7 +-
 htdocs/langs/zh_CN/commercial.lang    |   6 +
 htdocs/langs/zh_CN/holiday.lang       |   2 +
 htdocs/langs/zh_CN/mails.lang         |   1 -
 htdocs/langs/zh_CN/main.lang          |  10 ++
 htdocs/langs/zh_CN/members.lang       |   4 +-
 htdocs/langs/zh_CN/modulebuilder.lang |   3 +-
 htdocs/langs/zh_CN/projects.lang      |   7 +-
 htdocs/langs/zh_CN/salaries.lang      |   2 +
 htdocs/langs/zh_CN/stocks.lang        |   2 +
 htdocs/langs/zh_CN/trips.lang         |   6 +-
 htdocs/langs/zh_CN/website.lang       |   9 +-
 htdocs/langs/zh_TW/admin.lang         |   7 +-
 htdocs/langs/zh_TW/commercial.lang    |   6 +
 htdocs/langs/zh_TW/holiday.lang       |   2 +
 htdocs/langs/zh_TW/mails.lang         |   1 -
 htdocs/langs/zh_TW/main.lang          |  10 ++
 htdocs/langs/zh_TW/members.lang       |   4 +-
 htdocs/langs/zh_TW/modulebuilder.lang |   3 +-
 htdocs/langs/zh_TW/projects.lang      |   7 +-
 htdocs/langs/zh_TW/salaries.lang      |   2 +
 htdocs/langs/zh_TW/stocks.lang        |   2 +
 htdocs/langs/zh_TW/trips.lang         |   6 +-
 htdocs/langs/zh_TW/website.lang       |   9 +-
 697 files changed, 2685 insertions(+), 1368 deletions(-)

diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 4f1f38de7be..bfaf6ceff41 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -8,7 +8,7 @@ ACCOUNTING_EXPORT_AMOUNT=تصدير الكمية
 ACCOUNTING_EXPORT_DEVISE=Export currency
 Selectformat=حدد تنسيق للملف
 ACCOUNTING_EXPORT_PREFIX_SPEC=تحديد بادئة لاسم الملف
-ThisService=This service
+ThisService=هذه الخدمة
 ThisProduct=This product
 DefaultForService=Default for service
 DefaultForProduct=Default for product
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 22cfd234427..a2440db9e5b 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=اكتشاف تلقائي (لغة المتصفح)
 FeatureDisabledInDemo=الميزة معلطة في العرض التجريبي
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=الصلاحيات
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=يسمح لك لإدارة الشركات المتعددة
 Module6000Name=سير العمل
 Module6000Desc=إدارة سير العمل
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=ترك إدارة الطلبات
 Module20000Desc=أعلن وتابع الموظفين يترك طلبات
 Module39000Name=الكثير المنتج
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=ميزة لإرسال رسائل باستخدام
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=قاعدة لتوليد كلمات السر واقتر
 DisableForgetPasswordLinkOnLogonPage=لا تظهر وصلة "نسيت كلمة المرور" على صفحة تسجيل الدخول
 UsersSetup=شاهد الإعداد وحدة
 UserMailRequired=مطلوب بريد إلكتروني لإنشاء مستخدم جديد
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM وحدة الإعداد
 ##### Company setup #####
diff --git a/htdocs/langs/ar_SA/commercial.lang b/htdocs/langs/ar_SA/commercial.lang
index 7d95ba54e83..082138af222 100644
--- a/htdocs/langs/ar_SA/commercial.lang
+++ b/htdocs/langs/ar_SA/commercial.lang
@@ -70,3 +70,9 @@ Stats=إحصاءات المبيعات
 StatusProsp=احتمال وضع
 DraftPropals=صياغة مقترحات تجارية
 NoLimit=لا حدود
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
index a1c028e3b7d..a98958cb808 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=ترك طلب الإلغاء
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 57b5747646a..193a8bd25bb 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=فريدة من شركات الاتصالات
 MailNoChangePossible=صادق المتلقين للمراسلة لا يمكن تغيير
 SearchAMailing=البحث البريدية
 SendMailing=إرسال البريد الإلكتروني
-SendMail=إرسال بريد إلكتروني
 SentBy=أرسلها
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=ولكن يمكنك إرسالها عبر الإنترنت عن طريق إضافة معلمة MAILING_LIMIT_SENDBYWEB مع قيمة الحد الأقصى لعدد من رسائل البريد الإلكتروني التي تريد إرسالها من خلال هذه الدورة.
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index ba4c563754e..3aac86f9493 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -266,8 +266,10 @@ DateApprove2=تاريخ الموافقة (موافقة الثانية)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=سنة
 DurationMonth=شهر
 DurationWeek=أسبوع
@@ -608,6 +610,7 @@ SendByMail=أرسل عن طريق البريد الالكتروني
 MailSentBy=البريد الإلكتروني التي بعث بها
 TextUsedInTheMessageBody=هيئة البريد الإلكتروني
 SendAcknowledgementByMail=Send confirmation email
+SendMail=إرسال بريد إلكتروني
 EMail=البريد الإلكتروني
 NoEMail=أي بريد إلكتروني
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=تقرير حساب
+ExpenseReports=تقارير المصاريف
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=الأحداث
 EMailTemplates=رسائل البريد الإلكتروني قوالب
 FileNotShared=File not shared to exernal public
+Project=المشروع
+Projects=مشاريع
+Rights=الصلاحيات
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 216c86d4e30..8ba979e12a4 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=دوران (لشركة) أو الميزانية (على أسا
 DefaultAmount=المبلغ الافتراضي للاكتتاب
 CanEditAmount=يمكن للزائر اختيار / تحرير كمية من اكتتابها
 MEMBER_NEWFORM_PAYONLINE=القفز على صفحة الدفع عبر الانترنت المتكاملة
-ByProperties=حسب الخصائص
-MembersStatisticsByProperties=إحصائيات الأعضاء حسب الخصائص
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=هذه الشاشة تظهر لك إحصاءات عن أعضاء من الطبيعة.
 MembersByRegion=هذه الشاشة تظهر لك إحصاءات عن أعضاء حسب المنطقة.
 VATToUseForSubscriptions=معدل ضريبة القيمة المضافة لاستخدامه في اشتراكات
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index b038f6cabfb..0b84c1a23aa 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -4,126 +4,126 @@ ProductLabel=وصف المنتج
 ProductLabelTranslated=تسمية المنتج مترجمة
 ProductDescriptionTranslated=ترجم وصف المنتج
 ProductNoteTranslated=ترجم مذكرة المنتج
-ProductServiceCard=منتجات / خدمات البطاقات
+ProductServiceCard=منتجات / بطاقة الخدمات
 TMenuProducts=المنتجات
 TMenuServices=الخدمات
 Products=المنتجات
 Services=الخدمات
 Product=المنتج
 Service=الخدمة
-ProductId=المنتجات / الخدمات معرف
+ProductId=معرف المنتج و الخدمة
 Create=إنشاء
-Reference=المرجعية
-NewProduct=منتجات جديدة
+Reference=المرجع
+NewProduct=منتج جديد
 NewService=خدمة جديدة
-ProductVatMassChange=تغيير VAT الشامل
-ProductVatMassChangeDesc=هذه الصفحة يمكن استخدامها لتعديل نسبة الضريبة على القيمة المضافة المحددة على المنتجات أو الخدمات من قيمة إلى أخرى. تحذير، ويتم هذا التغيير على كل قاعدة البيانات.
+ProductVatMassChange=تغيير جماعي لضريبة القيمة المضافة
+ProductVatMassChangeDesc=هذه الصفحة يمكن استخدامها لتعديل نسبة الضريبة على القيمة المضافة المحددة على المنتجات أو الخدمات من قيمة إلى أخرى. تحذير، يتم هذا التغيير على كل قاعدة البيانات.
 MassBarcodeInit=الحرف الأول الباركود الشامل
 MassBarcodeInitDesc=هذه الصفحة يمكن استخدامها لتهيئة الباركود على الكائنات التي لا يكون الباركود تعريف. تحقق قبل أن الإعداد وحدة الباركود كاملة.
-ProductAccountancyBuyCode=Accounting code (purchase)
-ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancyBuyCode=كود المحاسبة (شراء)
+ProductAccountancySellCode=كود المحاسبة (بيع)
 ProductOrService=المنتج أو الخدمة
 ProductsAndServices=المنتجات والخدمات
 ProductsOrServices=منتجات أو خدمات
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
+ProductsNotOnSell=منتجات ليست للبيع ولا الشراء
 ProductsOnSellAndOnBuy=المنتجات للبيع والشراء
 ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
+ServicesNotOnSell=خدمات ليست للبيع ولا الشراء
 ServicesOnSellAndOnBuy=خدمات للبيع والشراء
 LastModifiedProductsAndServices=Latest %s modified products/services
 LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=منتجات البطاقات
 CardProduct1=بطاقة الخدمة
-Stock=الأسهم
-Stocks=الاسهم
+Stock=المخزون
+Stocks=المخزون
 Movements=حركات
 Sell=مبيعات
 Buy=مشتريات
-OnSell=على بيع
-OnBuy=شراؤها
-NotOnSell=من بيع
-ProductStatusOnSell=على بيع
-ProductStatusNotOnSell=من بيع
-ProductStatusOnSellShort=على بيع
-ProductStatusNotOnSellShort=من بيع
-ProductStatusOnBuy=متاح
-ProductStatusNotOnBuy=عفا عليها الزمن
-ProductStatusOnBuyShort=متاح
-ProductStatusNotOnBuyShort=عفا عليها الزمن
+OnSell=متاح للبيع
+OnBuy=للشراء
+NotOnSell=ليس للبيع
+ProductStatusOnSell=متاح للبيع
+ProductStatusNotOnSell=ليس للبيع
+ProductStatusOnSellShort=متاح للبيع
+ProductStatusNotOnSellShort=ليس للبيع
+ProductStatusOnBuy=متاح للشراء
+ProductStatusNotOnBuy=ليس للشراء
+ProductStatusOnBuyShort=متاح للشراء
+ProductStatusNotOnBuyShort=ليس للشراء
 UpdateVAT=تحديث الضريبة على القيمة المضافة
 UpdateDefaultPrice=تحديث السعر الافتراضي
 UpdateLevelPrices=أسعار التحديث لكل مستوى
 AppliedPricesFrom=تطبق الأسعار من
 SellingPrice=سعر البيع
 SellingPriceHT=سعر البيع (صافي الضرائب)
-SellingPriceTTC=سعر البيع (شركة الضريبية)
+SellingPriceTTC=سعر البيع (شامل الضريبية)
 CostPriceDescription=هذا السعر (صافية من الضرائب) يمكن استخدامها لتخزين متوسط ​​كمية هذا تكلفة المنتج لشركتك. قد يكون بأي ثمن على حساب نفسك، على سبيل المثال من متوسط ​​سعر الشراء بالإضافة إلى متوسط ​​إنتاج وتوزيع التكاليف.
 CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=السعر الجديد
-MinPrice=دقيقة. سعر البيع
+MinPrice=سعر البيع
 CantBeLessThanMinPrice=سعر البيع لا يمكن أن يكون أقل من الحد الأدنى المسموح لهذا المنتج (٪ ق بدون الضرائب)
-ContractStatusClosed=مغلقة
-ErrorProductAlreadyExists=منتج مع الإشارة ٪ ق موجود بالفعل.
-ErrorProductBadRefOrLabel=قيمة خاطئة لإشارة أو علامة.
+ContractStatusClosed=مغلق
+ErrorProductAlreadyExists=المنتج ذو المرجع %sموجود بالفعل.
+ErrorProductBadRefOrLabel=قيمة خاطئة لـ مرجع  أو ملصق.
 ErrorProductClone=كان هناك مشكلة أثناء محاولة استنساخ المنتج أو الخدمة.
 ErrorPriceCantBeLowerThanMinPrice=خطأ، سعر لا يمكن أن يكون أقل من الحد الأدنى السعر.
 Suppliers=الموردين
-SupplierRef=المرجع المورد.
-ShowProduct=وتظهر المنتج
-ShowService=وتظهر الخدمة
-ProductsAndServicesArea=مجال المنتجات والخدمات
-ProductsArea=منتجات المنطقة
-ServicesArea=مجال الخدمات
-ListOfStockMovements=قائمة الحركات الأسهم
+SupplierRef=مرجع مورد المنتجات.
+ShowProduct=عرض المنتج
+ShowService=عرض الخدمة
+ProductsAndServicesArea=منطقة المنتجات والخدمات
+ProductsArea=منطقة المنتجات
+ServicesArea=منطقة الخدمات
+ListOfStockMovements=قائمة الحركات المخزون
 BuyingPrice=سعر الشراء
 PriceForEachProduct=المنتجات بأسعار محددة
 SupplierCard=بطاقة المورد
-PriceRemoved=رفع الأسعار
+PriceRemoved=تمت إزالة السعر
 BarCode=الباركود
 BarcodeType=نوع الباركود
 SetDefaultBarcodeType=حدد نوع الباركود
 BarcodeValue=قيمة الباركود
-NoteNotVisibleOnBill=علما) على الفواتير غير مرئي ، واقتراحات...)
+NoteNotVisibleOnBill=ملحوظة(غيرمرئية على الفواتير والعروض...)
 ServiceLimitedDuration=إذا كان المنتج هو خدمة لفترة محدودة :
-MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
+MultiPricesAbility=عدة شرائح من أسعار لكل منتج / خدمة (كل عميل في شريحة واحدة)
 MultiPricesNumPrices=عدد من السعر
-AssociatedProductsAbility=Activate the feature to manage virtual products
-AssociatedProducts=المنتجات
-AssociatedProductsNumber=عدد المنتجات
-ParentProductsNumber=عدد الوالد منتجات التعبئة والتغليف
+AssociatedProductsAbility=تنشيط ميزة إدارة المنتجات الإفتراضية
+AssociatedProducts=المنتجات الإفتراضية
+AssociatedProductsNumber=عدد المنتجات التي تنتج هذا المنتج الإفتراضي
+ParentProductsNumber=عدد منتج التعبئة الاب
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
-KeywordFilter=الكلمة الرئيسية فلتر
-CategoryFilter=فئة فلتر
-ProductToAddSearch=إضافة إلى البحث عن المنتج
-NoMatchFound=العثور على أي مباراة
+IfZeroItIsNotAVirtualProduct=إذا كان 0، هذا المنتج ليس منتج إفتراضي
+IfZeroItIsNotUsedByVirtualProduct=إذا كان 0، لا يتم استخدام هذا المنتج من قبل أي منتج إفتراضي
+KeywordFilter=فلتر الكلمة المقتاحية
+CategoryFilter=فلتر التصنيف
+ProductToAddSearch= إبحث عن منتج لإضافتة
+NoMatchFound=لا يوجد نتائج متطابقة
 ListOfProductsServices=List of products/services
-ProductAssociationList=قائمة المنتجات / الخدمات التي هي مكون من مكونات هذا المنتج الظاهري / حزمة
-ProductParentList=قائمة من المنتجات / الخدمات مع هذا المنتج كعنصر
+ProductAssociationList=قائمة المنتجات / الخدمات التي هي مكون من مكونات هذا المنتج/ الحزمة الإفتراضية
+ProductParentList=قائمة من المنتجات / الخدمات الإفتراضية مع هذا المنتج كعنصر مكون
 ErrorAssociationIsFatherOfThis=واحد من اختيار المنتج الأم الحالية المنتج
-DeleteProduct=حذف المنتجات / الخدمات
-ConfirmDeleteProduct=هل أنت متأكد من حذف هذه المنتجات / الخدمات؟
-ProductDeleted=المنتجات والخدمات "٪ ل" حذفها من قاعدة البيانات.
+DeleteProduct=حذف منتج / خدمة
+ConfirmDeleteProduct=هل أنت متأكد من حذف هذا المنتج / الخدمة؟
+ProductDeleted=المنتج /الخدمة "%s" تم حذفها من قاعدة البيانات.
 ExportDataset_produit_1=المنتجات
 ExportDataset_service_1=الخدمات
 ImportDataset_produit_1=المنتجات
 ImportDataset_service_1=الخدمات
 DeleteProductLine=حذف خط الإنتاج
-ConfirmDeleteProductLine=هل أنت متأكد من أنك تريد حذف هذا السطر المنتج؟
+ConfirmDeleteProductLine=هل أنت متأكد من أنك تريد حذف خط الإنتاج؟
 ProductSpecial=خاص
 QtyMin=الحد الأدنى من الكمية
-PriceQtyMin=ثمن هذا دقيقة. الكمية (ث / س الخصم)
+PriceQtyMin=ثمن هذا الحد الادنى (ث / س الخصم)
 VATRateForSupplierProduct=معدل ضريبة القيمة المضافة (لهذا المورد / المنتج)
-DiscountQtyMin=خصم الكمية الافتراضية ل
-NoPriceDefinedForThisSupplier=لا السعر الكمية المحددة لهذا المورد / المنتج
-NoSupplierPriceDefinedForThisProduct=لا مورد السعر الكمية المحددة لهذا المنتج
+DiscountQtyMin=الخصم الإفتراضي للكمية
+NoPriceDefinedForThisSupplier=لا يوجد سعر أو كمية محددة لهذا المورد / المنتج
+NoSupplierPriceDefinedForThisProduct=لا  سعر أو كمية محددة لهذا المنتج من قبل المورد
 PredefinedProductsToSell=منتجات محددة مسبقا للبيع
 PredefinedServicesToSell=خدمات محددة مسبقا للبيع
 PredefinedProductsAndServicesToSell=منتجات محددة مسبقا / خدمات للبيع
@@ -131,27 +131,27 @@ PredefinedProductsToPurchase=المنتج مسبقا لشراء
 PredefinedServicesToPurchase=خدمات محددة مسبقا لشراء
 PredefinedProductsAndServicesToPurchase=منتجات محددة مسبقا / خدمات أن puchase
 NotPredefinedProducts=Not predefined products/services
-GenerateThumb=يولد الإبهام
-ServiceNb=خدمة ق # ٪
+GenerateThumb=توليد صورة مصغرة
+ServiceNb=خدمة #%s
 ListProductServiceByPopularity=قائمة المنتجات / الخدمات حسب الشهرة
-ListProductByPopularity=قائمة المنتجات / الخدمات شعبية
-ListServiceByPopularity=قائمة الخدمات حسب الشهرة
+ListProductByPopularity=قائمة المنتجات / الخدمات بحسب الشهرة
+ListServiceByPopularity=قائمة الخدمات بحسب الشهرة
 Finished=المنتجات المصنعة
-RowMaterial=المادة الأولى
+RowMaterial=المادة الخام
 CloneProduct=استنساخ المنتجات أو الخدمات
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=استنساخ جميع المعلومات الرئيسية من المنتجات / الخدمات
-ClonePricesProduct=استنساخ الرئيسية معلومات والأسعار
-CloneCompositionProduct=استنساخ حزم المنتج / الخدمة
+ConfirmCloneProduct=هل انت متأكد انك ترغب في استنساخ المنتج/الخدمة <b>%s</b>؟
+CloneContentProduct=استنساخ جميع المعلومات الرئيسية لـ المنتج / الخدمة
+ClonePricesProduct=استنساخ المعلومات الرئيسية والأسعار
+CloneCompositionProduct=استنساخ منتج / خدمة معبئة
 CloneCombinationsProduct=Clone product variants
-ProductIsUsed=ويستخدم هذا المنتج
-NewRefForClone=المرجع. من المنتجات الجديدة / خدمة
+ProductIsUsed=هذا المنتج يتم استخدامة
+NewRefForClone=مرجع. المنتج/ الخدمة الجديدة 
 SellingPrices=أسعار بيع
 BuyingPrices=شراء أسعار
-CustomerPrices=أسعار العملاء
+CustomerPrices=أسعار العميل
 SuppliersPrices=أسعار المورد
 SuppliersPricesOfProductsOrServices=أسعار المورد (منتجات أو خدمات)
-CustomCode=Customs/Commodity/HS code
+CustomCode=الجمارك/السلع /كود HS
 CountryOrigin=بلد المنشأ
 Nature=طبيعة
 ShortLabel=التسمية قصيرة
@@ -189,12 +189,12 @@ unitM2=Square meter
 unitM3=Cubic meter
 unitL=Liter
 ProductCodeModel=قالب المرجع المنتج
-ServiceCodeModel=قالب المرجع الخدمة
+ServiceCodeModel=قالب مرجع الخدمة
 CurrentProductPrice=السعر الحالي
-AlwaysUseNewPrice=دائما استخدام السعر الحالي للمنتج / خدمة
-AlwaysUseFixedPrice=استخدام سعر ثابت
+AlwaysUseNewPrice=دائما استخدم السعر الحالي للمنتج / الخدمة
+AlwaysUseFixedPrice=استخدم السعر الثابت
 PriceByQuantity=أسعار مختلفة حسب الكمية
-PriceByQuantityRange=كمية مجموعة
+PriceByQuantityRange=مدى الكمية
 MultipriceRules=Price segment rules
 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
 PercentVariationOver=٪٪ الاختلاف على الصورة٪
@@ -202,26 +202,26 @@ PercentDiscountOver=٪٪ خصم أكثر من٪ الصورة
 KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
 ### composition fabrication
 Build=إنتاج
-ProductsMultiPrice=Products and prices for each price segment
+ProductsMultiPrice=المنتجات و الاسعار لكل شريحة
 ProductsOrServiceMultiPrice=أسعار العملاء (منتجات أو خدمات، أسعار متعددة)
-ProductSellByQuarterHT=منتجات دوران الفصلية قبل الضرائب
-ServiceSellByQuarterHT=خدمات دوران الفصلية قبل الضرائب
-Quarter1=1. ربع
-Quarter2=2. ربع
-Quarter3=3. ربع
-Quarter4=4. ربع
-BarCodePrintsheet=طباعة قانون نقابة المحامين
-PageToGenerateBarCodeSheets=مع هذه الأداة، يمكنك طباعة ورقة من الملصقات الرمز الشريطي. اختيار شكل الصفحة ملصقا، ونوع الباركود وقيمة الباركود، ثم انقر على <b>زر٪ الصورة.</b>
+ProductSellByQuarterHT=دورة المنتجات الربع سنوية قبل الضرائب
+ServiceSellByQuarterHT=دورة الخدمات الربع سنوية قبل الضرائب
+Quarter1=الربع الإول
+Quarter2=الربع الثاني
+Quarter3=الربع الثالث
+Quarter4=الربع الرابع
+BarCodePrintsheet=طباعة الباركود
+PageToGenerateBarCodeSheets=مع هذه الأداة، يمكنك طباعة أوراق من الباركود. اختار نوع صفحة الملصقات، ونوع وقيمة  الباركود، ثم انقر على زر <b>%s</b>
 NumberOfStickers=عدد من الملصقات للطباعة على الصفحة
 PrintsheetForOneBarCode=طباعة عدة ملصقات لالباركود واحد
-BuildPageToPrint=توليد الصفحة لطباعة
-FillBarCodeTypeAndValueManually=ملء نوع الباركود والقيمة يدويا.
-FillBarCodeTypeAndValueFromProduct=ملء نوع الباركود وقيمة من الباركود للمنتج.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=تعريف نوع أو قيمة الرمز الشريطي يست كاملة للمنتج٪ الصورة.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
-BarCodeDataForProduct=معلومات الباركود من الناتج٪ الصورة:
-BarCodeDataForThirdparty=Barcode information of third party %s :
+BuildPageToPrint=توليد صفحة للطباعة
+FillBarCodeTypeAndValueManually=ملء نوع وقيمة الباركود  يدويا.
+FillBarCodeTypeAndValueFromProduct=ملء نوع وقيمة الباركود من باركود المنتج.
+FillBarCodeTypeAndValueFromThirdParty=ملء نوع وقيمة الباركود من باركود طرف ثالت.
+DefinitionOfBarCodeForProductNotComplete=تعريف نوع أو قيمة الباركود ليس كامل للمنتج%s.
+DefinitionOfBarCodeForThirdpartyNotComplete=تعريف نوع أو قيمة الباركود ليس كامل للطرف الثالث %s
+BarCodeDataForProduct=معلومات الباركود للمنتج%s :
+BarCodeDataForThirdparty=معلومات الباركود للطرف الثالث%s:
 ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 169d82452b2..5c88722ed5c 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -3,8 +3,6 @@ RefProject=المرجع. مشروع
 ProjectRef=المرجع المشروع.
 ProjectId=رقم المشروع
 ProjectLabel=تسمية المشروع
-Project=المشروع
-Projects=المشاريع
 ProjectsArea=Projects Area
 ProjectStatus=حالة المشروع
 SharedProject=مشاريع مشتركة
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=وتبين للمشروع
+ShowTask=وتظهر هذه المهمة
 SetProject=وضع المشروع
 NoProject=لا يعرف أو المملوكة للمشروع
 NbOfProjects=ملاحظة : للمشاريع
@@ -77,6 +76,7 @@ Time=وقت
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=قائمة المقترحات التجارية المرتبطة بالمشروع.
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=فتح مشروع
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=مشروع اتصالات
+TaskContact=Task contacts
 ActionsOnProject=الإجراءات على المشروع
 YouAreNotContactOfProject=كنت لا اتصال لهذا المشروع الخاص
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=قضى الوقت حذف
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=انظر أيضا المهام  الغير موكلة الي
 ShowMyTasksOnly=عرض فقط المهام الموكلة الي
-TaskRessourceLinks=مصادر
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=مشاريع مخصصة لهذا الطرف الثالث
 NoTasks=أية مهام لهذا المشروع
 LinkedToAnotherCompany=ربط طرف ثالث آخر
diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
index ac60cd65b73..ff403fd856a 100644
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=الراتب الحالي
 THMDescription=يمكن استخدام هذه القيمة لحساب تكلفة الوقت المستهلك في المشروع المدخل من قبل المستخدمين إذا تم استخدام وحدة مشروع 
 TJMDescription=هذه القيمة هي حاليا فقط كمعلومات وليس لاستخدامها في أي حساب
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 8c061d90da9..e44316daeb8 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -22,6 +22,7 @@ Movements=حركات
 ErrorWarehouseRefRequired=مستودع الاشارة اسم مطلوب
 ListOfWarehouses=لائحة المخازن
 ListOfStockMovements=قائمة الحركات الأسهم
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=منطقة المستودعات
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=تسمية الحركة
+DateMovement=Date of movement
 InventoryCode=حركة المخزون أو كود
 IsInPackage=الواردة في حزمة
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang
index 7aad756df45..af23afca8e2 100644
--- a/htdocs/langs/ar_SA/trips.lang
+++ b/htdocs/langs/ar_SA/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=تقرير حساب
-ExpenseReports=تقارير المصاريف
 ShowExpenseReport=عرض تقرير حساب
 Trips=تقارير المصاريف
 TripsAndExpenses=تقارير النفقات
@@ -12,6 +10,8 @@ ListOfFees=قائمة الرسوم
 TypeFees=Types of fees
 ShowTrip=عرض تقرير حساب
 NewTrip=تقرير حساب جديد
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=كم المبلغ أو
 DeleteTrip=حذف تقرير حساب
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=لقد أعلن تقرير حساب آخر في نطاق تاريخ مماثل.
 AucuneLigne=لا يوجد تقرير مصروفات تعلن بعد
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index edf781cd4f6..d6e732a2141 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 53749abf993..1f12464111b 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Автоматично (език на браузъра)
 FeatureDisabledInDemo=Feature инвалиди в демо
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Права
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Показани са само елементи от <a href="%s">активирани модули</a>.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Позволява ви да управлявате няколк
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Член за генериране на предлож
 DisableForgetPasswordLinkOnLogonPage=Да не се показват връзката &quot;Забравена парола&quot; на страницата за вход
 UsersSetup=Потребители модул за настройка
 UserMailRequired=Задължително е въвеждането на имейл при създаване на нов потребител
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/bg_BG/commercial.lang b/htdocs/langs/bg_BG/commercial.lang
index 48090164484..a9129075cff 100644
--- a/htdocs/langs/bg_BG/commercial.lang
+++ b/htdocs/langs/bg_BG/commercial.lang
@@ -70,3 +70,9 @@ Stats=Статистика на продажбите
 StatusProsp=Prospect статус
 DraftPropals=Проектът на търговски предложения
 NoLimit=Няма лимит
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
index bd4f6bb0e21..8ecb7b74d40 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Отказване на молба за отпуск
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 7462e468a87..5acdb4953de 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Уникални контакти на фирми
 MailNoChangePossible=Получатели на за валидирани електронната поща не може да бъде променена
 SearchAMailing=Търсене пощенски
 SendMailing=Изпращане на имейл
-SendMail=Изпращане на имейл
 SentBy=Изпратено от
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Все пак можете да ги изпратите онлайн чрез добавяне на параметър MAILING_LIMIT_SENDBYWEB със стойност на максимален брой на имейлите, които искате да изпратите от сесията. За това, отидете на дома - Setup - Други.
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index e7c1b701853..a9266174e7e 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Дата на одобрение (повторно одобрени
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=година
 DurationMonth=месец
 DurationWeek=седмица
@@ -608,6 +610,7 @@ SendByMail=Изпрати по имейл
 MailSentBy=Изпратено по имейл от
 TextUsedInTheMessageBody=Текст на имейла
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Изпращане на имейл
 EMail=Имейл
 NoEMail=Няма имейл
 Email=Имейл
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Уеб Сайт
+WebSites=Web sites
+ExpenseReport=Доклад разходи
+ExpenseReports=Опис разходи
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Събития
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Проект
+Projects=Проекти
+Rights=Права
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 2ed9ff95f89..7a51a30538e 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Оборот (за фирма) или Бюджет (за орг
 DefaultAmount=Сума по подразбиране за членски внос
 CanEditAmount=Посетител може да избере/редактира размера на вноската си
 MEMBER_NEWFORM_PAYONLINE=Прехвърляне към интегрираната онлайн страница за плащане
-ByProperties=По характеристики
-MembersStatisticsByProperties=Статистики на членовете по характеристики
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Този екран ви показва статистики на членовете по същност.
 MembersByRegion=Този екран ви показва статистики на членовете по регион.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 67b6a6aa807..b3c0f7d370f 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -3,8 +3,6 @@ RefProject=Реф. проект
 ProjectRef=Проект реф.
 ProjectId=Id на проект
 ProjectLabel=Етикет на проект
-Project=Проект
-Projects=Проекти
 ProjectsArea=Projects Area
 ProjectStatus=Статус на проект
 SharedProject=Всички
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Покажи проект
+ShowTask=Покажи задача
 SetProject=Задайте проект
 NoProject=Нито един проект няма определени или собственост
 NbOfProjects=Nb на проекти
@@ -77,6 +76,7 @@ Time=Време
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Списък на търговските предложения, свързани с проекта
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Проект с отворен
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=ПРОЕКТА Контакти
+TaskContact=Task contacts
 ActionsOnProject=Събития по проекта
 YouAreNotContactOfProject=Вие не сте контакт на този частен проект
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Изтриване на времето, прекарано
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Показване също на задачи, които не са възложени на мен
 ShowMyTasksOnly=Показване задачи, възложени само на мен
-TaskRessourceLinks=Ресурси
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Проекти, насочени към този контрагент
 NoTasks=Няма задачи за този проект
 LinkedToAnotherCompany=Свързано с друг контрагент
diff --git a/htdocs/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang
index 7bb5fc9858e..7b89be5216f 100644
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Сегашна заплата
 THMDescription=Тази стойност може да използва за изчисляване на отнето време по проект отделено от потребителите ако модул проект се използва
 TJMDescription=Тази стойност е само сега като информация и не се използва за никакво изчисление
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index cf6419ef866..4224de73b2d 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -22,6 +22,7 @@ Movements=Движения
 ErrorWarehouseRefRequired=Изисква се референтно име на склад
 ListOfWarehouses=Списък на складовете
 ListOfStockMovements=Списък на движението на стоковите наличности
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang
index d4f5c3e6203..2e539afe9c5 100644
--- a/htdocs/langs/bg_BG/trips.lang
+++ b/htdocs/langs/bg_BG/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Доклад разходи
-ExpenseReports=Expense reports
 ShowExpenseReport=Показване на доклад за разходи
 Trips=Expense reports
 TripsAndExpenses=Доклади разходи
@@ -12,6 +10,8 @@ ListOfFees=Списък на такси
 TypeFees=Types of fees
 ShowTrip=Показване на доклад за разходи
 NewTrip=Нов доклад за разходи
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Сума или км
 DeleteTrip=Изтриване на доклад за разходи
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Създали сте друг доклад за разходи в подобен времеви отрязък.
 AucuneLigne=Няма все още деклариран доклад за разходи 
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index 532a049a97c..2d3b7514acc 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Изтрийте уебсайт
 ConfirmDeleteWebsite=Сигурни ли сте, че искате да изтриете този уебсайт? Всички негови страници и съдържание ще бъдат премахнати.
 WEBSITE_PAGENAME=Име на страницата
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=Линк към външен CSS файл
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Редактирай CSS или HTML header
 EditMenu=Редактирай
 EditMedias=Edit medias
 EditPageMeta=Редайтирай Meta
-Website=Уеб Сайт
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Добави страница/контейнер
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 181274892a4..64b005c8278 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/bn_BD/commercial.lang b/htdocs/langs/bn_BD/commercial.lang
index deb66143b82..a832775b36c 100644
--- a/htdocs/langs/bn_BD/commercial.lang
+++ b/htdocs/langs/bn_BD/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/bn_BD/holiday.lang b/htdocs/langs/bn_BD/holiday.lang
index 462515ca9a2..1c19d69732a 100644
--- a/htdocs/langs/bn_BD/holiday.lang
+++ b/htdocs/langs/bn_BD/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 9e5248aeced..27e041910bf 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index c3870f610a5..a2141ad3e47 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index fb7cc76c50e..fd0adc4c264 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/bn_BD/modulebuilder.lang b/htdocs/langs/bn_BD/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/bn_BD/modulebuilder.lang
+++ b/htdocs/langs/bn_BD/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index d46076309b7..f2e57a1ff8f 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/bn_BD/salaries.lang b/htdocs/langs/bn_BD/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/bn_BD/salaries.lang
+++ b/htdocs/langs/bn_BD/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 81708ae01c4..aec0029e6c5 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/bn_BD/trips.lang b/htdocs/langs/bn_BD/trips.lang
index bf9fea30f68..a741a9f6e5f 100644
--- a/htdocs/langs/bn_BD/trips.lang
+++ b/htdocs/langs/bn_BD/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 83174a8fe3d..1a5fc896bfa 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Automatsko otkrivanje (jezik preglednika)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Dozvole
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow - Tok rada
 Module6000Desc=Upravljanje workflow-om - tokom rada
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/bs_BA/commercial.lang b/htdocs/langs/bs_BA/commercial.lang
index 7fa3801665c..5ae852c86e0 100644
--- a/htdocs/langs/bs_BA/commercial.lang
+++ b/htdocs/langs/bs_BA/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Status mogućeg klijenta
 DraftPropals=Nacrti poslovnih prijedloga
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
index 864895fed9c..e5354131a69 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index de10c9cdf71..cc7ff8e9945 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Jedinstveni kontakti/adrese
 MailNoChangePossible=Primaoci za potvrđenu e-poštu ne mogu biti promijenjeni
 SearchAMailing=Traži e-poštu
 SendMailing=Pošalji e-poštu
-SendMail=Pošalji e-mail
 SentBy=Poslano od
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Možete ih poslati online dodavanjem parametra MAILING_LIMIT_SENDBYWEB sa vrijednosti za maksimalni broj e-mailova koje želite poslati po sesiji. Za ovo idite na Početna - Postavke - Ostalo
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 5b99c33a228..6ad85bf0cdc 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Datum odobrenja (drugo odobrenje)
 RegistrationDate=Registration date
 UserCreation=Kreiranje korisnika
 UserModification=Izmjena korisnika
+UserValidation=Validation user
 UserCreationShort=Napr. korisnika
 UserModificationShort=Izmj. korisnika
+UserValidationShort=Valid. user
 DurationYear=godina
 DurationMonth=mjesec
 DurationWeek=sedmica
@@ -608,6 +610,7 @@ SendByMail=Pošalji emailom
 MailSentBy=Email je poslao
 TextUsedInTheMessageBody=Tekst emaila
 SendAcknowledgementByMail=Pošalji konfirmacijski email
+SendMail=Pošalji e-mail
 EMail=Email
 NoEMail=nema emaila
 Email=email
@@ -808,6 +811,10 @@ ModuleBuilder=Kreator modula
 SetMultiCurrencyCode=Postavi valutu
 BulkActions=Masovne akcije
 ClickToShowHelp=Klikni za prikaz pomoći
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Izvještaj o troškovima
 HR=LJR
 HRAndBank=LJR i banka
 AutomaticallyCalculated=Automatski izračunato
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Događaji
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projekti
+Rights=Dozvole
 # Week day
 Monday=Ponedjeljak
 Tuesday=Utorak
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index c15ab598d29..f72dcd72faf 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/bs_BA/modulebuilder.lang b/htdocs/langs/bs_BA/modulebuilder.lang
index fb86f35685f..54698ddde6b 100644
--- a/htdocs/langs/bs_BA/modulebuilder.lang
+++ b/htdocs/langs/bs_BA/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 1985003719a..7c24f558cda 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Projekt
-Projects=Projekti
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Zajednički projekti
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Prikaži projekt
+ShowTask=Show task
 SetProject=Postavi projekat
 NoProject=Nema definisanog ili vlastitog projekta
 NbOfProjects=Broj projekata
@@ -77,6 +76,7 @@ Time=Vrijeme
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Lista poslovnih prijedloga u vezi s projektom
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Otvori projekat
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
+TaskContact=Task contacts
 ActionsOnProject=Događaji na projektu
 YouAreNotContactOfProject=Vi niste kontakt ovog privatnog projekta
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Brisanje provedenog vremena
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resursi
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekti posvećeni ovom subjektu
 NoTasks=Nema zadataka za ovaj projekat
 LinkedToAnotherCompany=U vezi sa drugim subjektom
diff --git a/htdocs/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 51ae1e9e323..2fa396b7631 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -22,6 +22,7 @@ Movements=Kretanja
 ErrorWarehouseRefRequired=Referentno ime skladište je potrebno
 ListOfWarehouses=Lista skladišta
 ListOfStockMovements=Lista kretanja zaliha
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang
index 38bf1a56ed8..4c0281e12ff 100644
--- a/htdocs/langs/bs_BA/trips.lang
+++ b/htdocs/langs/bs_BA/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Izvještaj o troškovima
 ShowExpenseReport=Show expense report
 Trips=Izvještaj o troškovima
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Lista naknada
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Iznos ili kilometri
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index a47857e3e59..6c73899342a 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 087488edff1..99c02ea2286 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignorar errors de registres duplicats (INSERT IGNORE)
 AutoDetectLang=Autodetecta (idioma del navegador)
 FeatureDisabledInDemo=Opció deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionalitat disponible únicament en versions estables oficials 
-Rights=Permisos
 BoxesDesc=Els panells són components que mostren alguna informació que pots afegir per personalitzar algunes pàgines. Pots triar entre mostrar el panell o no seleccionant la pàgina de destí i fent clic a 'Activa', o fent clic al cubell d'escombraries per desactivar.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
 ModulesDesc=Els mòduls Dolibarr defineixen quina aplicació/característica està habilitada al programari. Algunes aplicacions/mòduls requereixen permisos que has de concedir als usuaris, després d'activar-los. Fes clic al botó d'activació/desactivació per habilitar un mòdul/aplicació.
@@ -593,7 +592,7 @@ Module5000Desc=Permet gestionar diverses empreses
 Module6000Name=Workflow
 Module6000Desc=Gestió Workflow
 Module10000Name=Pàgines web
-Module10000Desc=Crea pàgines web públiques amb un editor WYSIWYG. Només cal configurar el teu servidor web per apuntar aun un directori dedicat per tenir-ho online a Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Dies lliures
 Module20000Desc=Gestió dels dies lliures dels empleats
 Module39000Name=Lots de productes
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=La funcionalitat d'enviar correus electrònics a
 TranslationSetup=Configuració de traducció
 TranslationKeySearch=Cerca una clau o cadena de traducció
 TranslationOverwriteKey=Sobreescriu una cadena de traducció
-TranslationDesc=Com definir l'idioma de l'aplicació<br>* A nivell de sistema: menú <strong>Inici - Configuració - Entorn</strong><br>* Per usuari: Pestanya <strong>Configuració d'entorn d'usuari</strong> en la fitxa d'usuari (fes clic al nom d'usuari en la part superior de la pantalla).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=També pot reemplaçar cadenes omplint la taula següent. Triï el seu idioma a la llista desplegable "%s", inserta la clau de la traducció a "%s" i la seva nova traducció a "%s"
 TranslationOverwriteDesc2=Podeu utilitzar un altra pestanya per ajudar a saber quina clau de conversió utilitzar
 TranslationString=Cadena de traducció
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Norma per a la generació de les contrasenyes proposte
 DisableForgetPasswordLinkOnLogonPage=No mostrar l'enllaç "Contrasenya oblidada" a la pàgina de login
 UsersSetup=Configuració del mòdul usuaris
 UserMailRequired=E-mail necessari per crear un usuari nou
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=Configuració de mòdul de gestió de recursos humans
 ##### Company setup #####
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 289fcfd9696..196304683a2 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -70,3 +70,9 @@ Stats=Estadístiques de venda
 StatusProsp=Estat del pressupost
 DraftPropals=Pressupostos esborrany
 NoLimit=Sense límit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index d7a5dce2622..0ba5724cb8b 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Anulació de dies lliures
 EmployeeLastname=Cognoms de l'empleat
 EmployeeFirstname=Nom de l'empleat
 TypeWasDisabledOrRemoved=El tipus de dia lliure (id %s) ha sigut desactivat o eliminat
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Última actualització automàtica de reserva de dies lliures
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index f13cfd10d8f..6fc4a142a21 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Contactes/adreces únics
 MailNoChangePossible=Destinataris d'un E-Mailing validat no modificables
 SearchAMailing=Cercar un E-Mailing
 SendMailing=Envia e-mailing
-SendMail=Envia e-mail
 SentBy=Enviat por
 MailingNeedCommand=L'enviament d'un emailing pot realitzar-se desde la línia de comandos. Solicita a l'administrador del servidor que executi el següent comando per enviar l'emailing a tots els destinataris:
 MailingNeedCommand2=Podeu enviar en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb un valor nombre que indica el màxim nombre d'e-mails enviats per sessió. Per això aneu a Inici - Configuració - Varis
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index e23a95e631a..710ce67d0ad 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Data d'aprovació (segona aprovació)
 RegistrationDate=Registration date
 UserCreation=Usuari de creació
 UserModification=Usuari de modificació
+UserValidation=Validation user
 UserCreationShort=Usuari crea.
 UserModificationShort=Usuari modif.
+UserValidationShort=Valid. user
 DurationYear=any
 DurationMonth=mes
 DurationWeek=setmana
@@ -608,6 +610,7 @@ SendByMail=Envia per e-mail
 MailSentBy=Mail enviat per
 TextUsedInTheMessageBody=Text utilitzat en el cos del missatge
 SendAcknowledgementByMail=Envia el correu electrònic de confirmació
+SendMail=Envia e-mail
 EMail=Correu electrònic
 NoEMail=Sense correu electrònic
 Email=Correu
@@ -808,6 +811,10 @@ ModuleBuilder=Creador de mòdul
 SetMultiCurrencyCode=Estableix moneda
 BulkActions=Accions massives
 ClickToShowHelp=Fes clic per mostrar l'ajuda desplegable
+Website=Lloc web
+WebSites=Web sites
+ExpenseReport=Informe de despeses
+ExpenseReports=Informes de despeses
 HR=RRHH
 HRAndBank=RRHH i banc
 AutomaticallyCalculated=Calculat automàticament
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Esdeveniments
 EMailTemplates=Models d'emails
 FileNotShared=File not shared to exernal public
+Project=Projecte
+Projects=Projectes
+Rights=Permisos
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 232dc93275e..67ff89ee249 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Volum de vendes (empresa) o Pressupost (associació o col.lecti
 DefaultAmount=Import per defecte cotització
 CanEditAmount=El visitant pot triar/modificar l'import de la seva cotització
 MEMBER_NEWFORM_PAYONLINE=Anar a la pàgina integrada de pagament en línia
-ByProperties=Per característiques
-MembersStatisticsByProperties=Estadístiques dels socis per característiques
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Aquesta pantalla mostra estadístiques de socis per caràcter.
 MembersByRegion=Aquesta pantalla mostra les estadístiques de socis per regió.
 VATToUseForSubscriptions=Taxa d'IVA per les afiliacions
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 2912e09001d..9026d17b7ac 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=Arxiu amb regles de negoci
 LanguageFile=File for language
 ConfirmDeleteProperty=Esteu segur que voleu suprimir la propietat <strong>%s</strong> Això canviarà el codi a la classe PHP, però també eliminarà la columna de la definició de la taula de l'objecte.
 NotNull=No és NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Utilitzat per a 'cerca tot'
 DatabaseIndex=Índex de bases de dades
 FileAlreadyExists=El fitxer %s ja existeix
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 2bcdec249c7..dd37f770e15 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. projecte
 ProjectRef=Ref. projecte
 ProjectId=ID projecte
 ProjectLabel=Etiqueta de projecte
-Project=Projecte
-Projects=Projectes
 ProjectsArea=Àrea de projectes
 ProjectStatus=Estat el projecte
 SharedProject=Projecte compartit
@@ -38,6 +36,7 @@ OpenedTasks=Tasques obertes
 OpportunitiesStatusForOpenedProjects=Import d'oportunitats de projectes oberts per estat
 OpportunitiesStatusForProjects=Import d'oportunitats de projectes per estat
 ShowProject=Veure projecte
+ShowTask=Veure tasca
 SetProject=Indica el projecte
 NoProject=Cap projecte definit
 NbOfProjects=Nº de projectes
@@ -77,6 +76,7 @@ Time=Temps
 ListOfTasks=Llistat de tasques
 GoToListOfTimeConsumed=Ves al llistat de temps consumit
 GoToListOfTasks=Ves al llistat de tasques
+GanttView=Gantt View
 ListProposalsAssociatedProject=Llistat de pressupostos associats al projecte
 ListOrdersAssociatedProject=Llista de comandes de client associades al projecte
 ListInvoicesAssociatedProject=Llista de factures de client associades al projecte
@@ -108,6 +108,7 @@ AlsoCloseAProject=Tancar també el projecte (mantindre obert si encara necessita
 ReOpenAProject=Reobrir projecte
 ConfirmReOpenAProject=Vols reobrir aquest projecte?
 ProjectContact=Contactes projecte
+TaskContact=Task contacts
 ActionsOnProject=Esdeveniments del projecte
 YouAreNotContactOfProject=Vostè no és contacte d'aquest projecte privat
 UserIsNotContactOfProject=L'usuari no és un contacte d'aquest objecte privat
@@ -115,7 +116,7 @@ DeleteATimeSpent=Elimina el temps dedicat
 ConfirmDeleteATimeSpent=Estàs segur que vols suprimir aquest temps emprat?
 DoNotShowMyTasksOnly=Veure també tasques no assignades a mi
 ShowMyTasksOnly=Veure només les tasques que tinc assignades
-TaskRessourceLinks=Recursos
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projectes dedicats a aquest tercer
 NoTasks=Cap tasca per a aquest projecte
 LinkedToAnotherCompany=Enllaçat a una altra empresa
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index 3436ddea027..89a7405504d 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -13,3 +13,5 @@ TJM=Tarifa diaria mitjana
 CurrentSalary=Salari actual
 THMDescription=Aquest valor es pot utilitzar per calcular el cost del temps consumit per usuaris en un projecte sencer (si el mòdul del projecte està en ús)
 TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 619cef34b46..4e0609da5d2 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -22,6 +22,7 @@ Movements=Moviments
 ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori
 ListOfWarehouses=Llistat de magatzems
 ListOfStockMovements=Llistat de moviments de estoc
+MovementId=Movement ID
 StockMovementForId=ID de moviment %d
 ListMouvementStockProject=Llista de moviments d'estoc associats al projecte
 StocksArea=Àrea de magatzems
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=El nivell d'existències ha de ser suficient per afe
 StockMustBeEnoughForOrder=El nivell d'existències ha de ser suficient per afegir productes/serveis a comandes (la comprovació es fa quan s'afegeix una línia a la comanda en el cas de regles automàtiques de canvis d'estoc)
 StockMustBeEnoughForShipment= El nivell d'existències ha de ser suficient per afegir productes/serveis a enviaments (la comprovació es fa quan s'afegeix una línia a l'enviament en el cas de regles automàtiques de canvis d'estoc)
 MovementLabel=Etiqueta del moviment
+DateMovement=Date of movement
 InventoryCode=Moviments o codi d'inventari
 IsInPackage=Contingut en producte compost
 WarehouseAllowNegativeTransfer=L'estoc pot ser negatiu
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index d7b71de9c44..7975687d8a8 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Informe de despeses
-ExpenseReports=Informes de despeses
 ShowExpenseReport=Mostra l'informe de despeses
 Trips=Informes de despeses
 TripsAndExpenses=Informes de despeses
@@ -12,6 +10,8 @@ ListOfFees=Llistat notes de honoraris
 TypeFees=Tipus de despeses
 ShowTrip=Mostra l'informe de despeses
 NewTrip=Nou informe de despeses
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Empresa/organització visitada
 FeesKilometersOrAmout=Import o quilòmetres
 DeleteTrip=Eliminar informe de despeses
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Has declarat un altre informe de despeses en un altre rang de dates semblant
 AucuneLigne=Encara no hi ha informe de despeses declarat
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 68996493d3d..481fd00f848 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Elimina la pàgina web
 ConfirmDeleteWebsite=Estàs segur de voler elimiar aquesta pàgina web? També s'esborraran totes les pàgines i el seu contingut.
 WEBSITE_PAGENAME=Nom/alies de pàgina
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL del fitxer CSS extern
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edita l'estil/CSS o la capçalera HTML
 EditMenu=Edita menú
 EditMedias=Edit medias
 EditPageMeta=Edita "meta"
-Website=Lloc web
 AddWebsite=Add website
 Webpage=Pàgina/contenidor web
 AddPage=Afegeix pàgina/contenidor
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=No s'ha definit la URL de l'amfitrió virtual que serve
 NoPageYet=Encara sense pàgines
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index e5e14bcf560..e6f26487b27 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignorovat chyby duplicitních záznamů (INSERT IGNORE)
 AutoDetectLang=Autodetekce (jazyku prohlížeče)
 FeatureDisabledInDemo=Funkce zakázána v demu
 FeatureAvailableOnlyOnStable=Funkce je k dispozici pouze v oficiálních stabilních verzích
-Rights=Oprávnění
 BoxesDesc=Widgety jsou oblasti obrazovky, které ukazují krátké informace na některých stránkách. Můžete si vybrat mezi zobrazením/schováním boxu zvolením cílové stránky a kliknutím na 'Aktivovat' nebo kliknutím na popelnici ji zakázat.
 OnlyActiveElementsAreShown=Pouze prvky z <a href="%s">povolených modulů</a> jsou uvedeny.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Umožňuje spravovat více společností
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Webové stránky
-Module10000Desc=Vytvoření veřejné internetové stránky s editorem WYSIWG. Jen nastavit web serveru, aby odkazovaly na specializované adresáře, aby si to on-line na internetu.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Nechte řízení požadavků
 Module20000Desc=Deklarovat a dodržovat zaměstnanci opustí požadavky
 Module39000Name=Množství produktu
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Funkce se odesílat e-maily pomocí metody "PHP m
 TranslationSetup=Nastavení překladu
 TranslationKeySearch=Hledat klíč překlad nebo řetězec
 TranslationOverwriteKey=Přepsat překlad řetězec
-TranslationDesc=Jak nastavit zobrazený jazyk aplikace: <br> * systémovou: nabídku <strong> Domů - Nastavení - zobrazení </ strong> <br> * Per uživatele: Nastavení zobrazení <strong> uživatelů </ strong> na kartě uživatele (klikněte na uživatelské jméno v horní části obrazovky).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=Můžete také přepsat řetězce čerpacích následující tabulky. Vyberte si svůj jazyk „%s“ rozbalené, vložte klíč řetězec překlad do „%s“ a svým novým překladem do „%s“
 TranslationOverwriteDesc2=Můžete použít kartu další, které vám pomohou vědět, klíč překlad používat
 TranslationString=překlad string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Pravidlo pro generování hesel navrhovaná nebo ově
 DisableForgetPasswordLinkOnLogonPage=Nezobrazovat na odkaz &quot;Zapomněli jste heslo&quot; na přihlašovací stránce
 UsersSetup=Uživatelé modul nastavení
 UserMailRequired=EMail nutné vytvořit nového uživatele
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=setup HRM Modul
 ##### Company setup #####
diff --git a/htdocs/langs/cs_CZ/commercial.lang b/htdocs/langs/cs_CZ/commercial.lang
index 4501813aa3e..33e488fffa8 100644
--- a/htdocs/langs/cs_CZ/commercial.lang
+++ b/htdocs/langs/cs_CZ/commercial.lang
@@ -70,3 +70,9 @@ Stats=Prodejní statistiky
 StatusProsp=Stav cíle
 DraftPropals=Navrhnout obchodní návrhy
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang
index 11b5fbfbc0f..c6ddaa398a5 100644
--- a/htdocs/langs/cs_CZ/holiday.lang
+++ b/htdocs/langs/cs_CZ/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Stornovat dovolenou
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 50b1b2750b7..dcc3985b362 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unikátní kontakty/adresy
 MailNoChangePossible=Příjemce pro validované rozesílání nelze změnit
 SearchAMailing=Hledat mailing
 SendMailing=Poslat zprávy
-SendMail=Odeslat e-mail
 SentBy=Odeslal
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Můžete odeslat všem on-line přidáním parametru MAILING_LIMIT_SENDBYWEB s hodnotou max počet e-mailů, které chcete poslat v této dávce. K aktivaci přejděte na Domů - Nastavení - Ostatní.
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 8460231446b..67210810ed6 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Schválené datum (druhé schválení)
 RegistrationDate=Registration date
 UserCreation=Vytvořit uživatele
 UserModification=Upravit uživatele
+UserValidation=Validation user
 UserCreationShort=Creat. uživatel
 UserModificationShort=Modif. uživatel
+UserValidationShort=Valid. user
 DurationYear=rok
 DurationMonth=měsíc
 DurationWeek=týden
@@ -608,6 +610,7 @@ SendByMail=Poslat e-mailem
 MailSentBy=E-mail odeslán
 TextUsedInTheMessageBody=E-mail obsah
 SendAcknowledgementByMail=Zaslat potvrzovací e-mail
+SendMail=Odeslat e-mail
 EMail=E-mailem
 NoEMail=Žádný e-mail
 Email=E-mail
@@ -808,6 +811,10 @@ ModuleBuilder=module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Hromadné akce
 ClickToShowHelp=Click to show tooltip help
+Website=Webová stránka
+WebSites=Web sites
+ExpenseReport=Zpráva výdaje
+ExpenseReports=Zpráva výdajů
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Události
 EMailTemplates=E-maily šablony
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projekty
+Rights=Oprávnění
 # Week day
 Monday=Pondělí
 Tuesday=Úterý
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index b47c275f036..5ae3d8439c9 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Obrat (pro firmu), nebo rozpočet (pro nadaci)
 DefaultAmount=Výchozí částka předplatného
 CanEditAmount=Návštěvník si může vybrat / upravit výši svého upsaného
 MEMBER_NEWFORM_PAYONLINE=Přejít na integrované on-line platební stránky
-ByProperties=Charakteristikami
-MembersStatisticsByProperties=Členové statistiky dle charakteristik
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Tato obrazovka ukáže statistiky o členy z důvodu povahy.
 MembersByRegion=Tato obrazovka ukáže statistiky o členům regionu.
 VATToUseForSubscriptions=Sazba DPH se má použít pro předplatné
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 8b2afcbfe4e..a5e3ef61354 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -3,8 +3,6 @@ RefProject=Číslo projektu
 ProjectRef=Projekt ref.
 ProjectId=Id projektu
 ProjectLabel=štítek projekt
-Project=Projekt
-Projects=Projekty
 ProjectsArea=Oblast projektů
 ProjectStatus=Stav projektu
 SharedProject=Všichni
@@ -38,6 +36,7 @@ OpenedTasks=otevřené úkoly
 OpportunitiesStatusForOpenedProjects=Příležitosti množství otevřených projektů stavu
 OpportunitiesStatusForProjects=Příležitosti počet projektů podle stavu
 ShowProject=Zobrazit projekt
+ShowTask=Zobrazit úkol
 SetProject=Nastavit projekt
 NoProject=Žádný projekt nedefinován či vlastněn
 NbOfProjects=Počet projektů
@@ -77,6 +76,7 @@ Time=Čas
 ListOfTasks=Seznam úkolů
 GoToListOfTimeConsumed=Přejít na seznam času spotřebovaného
 GoToListOfTasks=Přejít na seznam úkolů
+GanttView=Gantt View
 ListProposalsAssociatedProject=Seznam obchodních návrhů spojených s projektem
 ListOrdersAssociatedProject=Seznam zákaznických objednávek související s projektem
 ListInvoicesAssociatedProject=Seznam zákaznických faktur souvisejících s projektem
@@ -108,6 +108,7 @@ AlsoCloseAProject=Také v blízkosti projektu (držet to otevřený, pokud ješt
 ReOpenAProject=Otevřít projekt
 ConfirmReOpenAProject=Jste si jisti, že chcete znovu otevřít tento projekt?
 ProjectContact=Kontakty projektu
+TaskContact=Task contacts
 ActionsOnProject=Události na projektu
 YouAreNotContactOfProject=Nejste kontakt tohoto privátního projektu
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Odstranit strávený čas
 ConfirmDeleteATimeSpent=Jste si jisti, že chcete smazat tento strávený čas?
 DoNotShowMyTasksOnly=Viz také úkoly mě nepřidělené
 ShowMyTasksOnly=Zobrazit pouze úkoly mě přidělené
-TaskRessourceLinks=Zdroje
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekty této třetí strany
 NoTasks=Žádné úkoly na tomto projektu
 LinkedToAnotherCompany=Připojené k jiné třetí straně
diff --git a/htdocs/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang
index daa3bcfee2c..5ce1d8519cd 100644
--- a/htdocs/langs/cs_CZ/salaries.lang
+++ b/htdocs/langs/cs_CZ/salaries.lang
@@ -13,3 +13,5 @@ TJM=Průměrná denní sazba
 CurrentSalary=Současná mzda
 THMDescription=Tato hodnota může být použita pro výpočet nákladů času spotřebovaného na projektu zadaného uživatele, pokud je použit modul projektu
 TJMDescription=Tato hodnota je v současné době pouze jako informace a nebyla využita k výpočtu
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 11399f61cb6..20b805106ca 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -22,6 +22,7 @@ Movements=Pohyby
 ErrorWarehouseRefRequired=Referenční jméno skladiště je povinné
 ListOfWarehouses=Seznam skladišť
 ListOfStockMovements=Seznam skladových pohybů
+MovementId=Movement ID
 StockMovementForId=Hnutí ID %d
 ListMouvementStockProject=Seznam pohybů zásob spojené s projektem
 StocksArea=Oblast skladišť
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Úroveň zásob musí být dostatečně přidat prod
 StockMustBeEnoughForOrder=Úroveň zásob musí být dostatečně přidat produkt / službu na objednávku (kontrola se provádí na současnou reálnou skladě při přidání řádku do pořádku, co je pravidlo pro automatickou změnu populace)
 StockMustBeEnoughForShipment= Úroveň zásob musí být dostatečně přidat výrobek / službu přepravy (kontrola se provádí na současnou reálnou skladě při přidání řádku do zásilky, co je pravidlo pro automatickou změnu populace)
 MovementLabel=Štítek pohybu
+DateMovement=Date of movement
 InventoryCode=Kód pohybu nebo zásob
 IsInPackage=Obsažené v zásilce
 WarehouseAllowNegativeTransfer=Sklad může být negativní
diff --git a/htdocs/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang
index 81c6e92fda8..3e65f39c76a 100644
--- a/htdocs/langs/cs_CZ/trips.lang
+++ b/htdocs/langs/cs_CZ/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Zpráva výdaje
-ExpenseReports=Zpráva výdajů
 ShowExpenseReport=Show expense report
 Trips=Zprávy výdaje
 TripsAndExpenses=Zprávy výdajů
@@ -12,6 +10,8 @@ ListOfFees=Sazebník poplatků
 TypeFees=Druhy poplatků
 ShowTrip=Show expense report
 NewTrip=Nová zpráva výdaje
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Množství nebo kilometrů
 DeleteTrip=Smazat zprávy o výdajích
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Deklaroval jste další hlášení výdajů do podobného časového období.
 AucuneLigne=Neexistuje žádná zpráva o právě deklarovaném výdaji
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index 466fc16194b..d224188467e 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Odstranit web
 ConfirmDeleteWebsite=Jste si jisti, že chcete smazat tuto webovou stránku? Všechny stránky a obsah budou odstraněny.
 WEBSITE_PAGENAME=Název stránky / alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL externího souboru CSS
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Úprava menu
 EditMedias=Edit medias
 EditPageMeta=Editovat Meta
-Website=Webová stránka
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 1b7a85d6d6c..0d9b88b8570 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browsersprog)
 FeatureDisabledInDemo=Funktionen slået fra i demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Tilladelser
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Giver dig mulighed for at administrere flere selskaber
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Regel at generere foreslået passwords
 DisableForgetPasswordLinkOnLogonPage=Ikke viser linket "Glem adgangskode" på loginsiden
 UsersSetup=Brugere modul opsætning
 UserMailRequired=EMail forpligtet til at oprette en ny bruger
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/da_DK/commercial.lang b/htdocs/langs/da_DK/commercial.lang
index 6927461c589..b8fe2c9eb66 100644
--- a/htdocs/langs/da_DK/commercial.lang
+++ b/htdocs/langs/da_DK/commercial.lang
@@ -70,3 +70,9 @@ Stats=Salgsstatistik
 StatusProsp=Status for emne
 DraftPropals=Udkast for tilbud
 NoLimit=Ingen grænse
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang
index 3963b481d96..477a20d890d 100644
--- a/htdocs/langs/da_DK/holiday.lang
+++ b/htdocs/langs/da_DK/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 140b2149148..eb1e077b9dd 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unikke kontakter af virksomheder
 MailNoChangePossible=Modtagere til validerede emailing kan ikke ændres
 SearchAMailing=Søg mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sendt af
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Du kan dog sende dem online ved at tilføje parameteren MAILING_LIMIT_SENDBYWEB med værdien af max antal e-mails, du vil sende ved session.
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 22c5bf707df..a9651bc5f44 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=år
 DurationMonth=måned
 DurationWeek=uge
@@ -608,6 +610,7 @@ SendByMail=Send via e-mail
 MailSentBy=E-mail sendt fra
 TextUsedInTheMessageBody=Email organ
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=Ingen e-mail
 Email=EMail
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Begivenheder
 EMailTemplates=E-mail skabeloner
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projekter
+Rights=Tilladelser
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index f781c2827a8..60ca95da27e 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Omsætning (for et selskab) eller Budget (en fond)
 DefaultAmount=Standard mængden af ​​abonnement
 CanEditAmount=Besøgende kan vælge / redigere størrelsen af ​​sit indskud
 MEMBER_NEWFORM_PAYONLINE=Hop på integreret online betaling side
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 9a38a8a4dc1..a942ffe0a8f 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Projekt
-Projects=Projekter
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Fælles projekt
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Vis projekt
+ShowTask=Vis opgave
 SetProject=Indstil projekt
 NoProject=Intet projekt defineret
 NbOfProjects=Nb af projekter
@@ -77,6 +76,7 @@ Time=Tid
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Liste over tilbud forbundet med projektet
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Åbn projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kontakter
+TaskContact=Task contacts
 ActionsOnProject=Begivenheder for projektet
 YouAreNotContactOfProject=Du er ikke en kontakt af denne private projekt
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Slet tid
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressourcer
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekter dedikeret til denne tredjepart
 NoTasks=Ingen opgaver for dette projekt
 LinkedToAnotherCompany=Knyttet til tredjemand
diff --git a/htdocs/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/da_DK/salaries.lang
+++ b/htdocs/langs/da_DK/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 2c30362b82e..93dc2273785 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -22,6 +22,7 @@ Movements=Bevægelser
 ErrorWarehouseRefRequired=Warehouse reference navn er påkrævet
 ListOfWarehouses=Liste over pakhuse
 ListOfStockMovements=Liste over lagerbevægelserne
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/da_DK/trips.lang b/htdocs/langs/da_DK/trips.lang
index a4f1cc301f4..06a22daf2de 100644
--- a/htdocs/langs/da_DK/trips.lang
+++ b/htdocs/langs/da_DK/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Liste over gebyrer
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Beløb eller kilometer
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 8bbbc6cbb77..a777386af68 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index bdccd4e6180..728f19891d7 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -26,7 +26,9 @@ Module310Desc=Mitgliederverwaltun
 Module330Desc=Bookmarks-Verwaltung
 Module500Name=Steuern, Sozialbeiträge und Dividenden
 Module500Desc=Steuer-, Sozialbeitrags- und Dividendenverwaltung
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50100Name=Kassa
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Permission31=Produkte/Services einsehen
 Permission32=Produkte/Services erstellen/bearbeiten
 Permission34=Produkte/Services löschen
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 8cb8a6f6c64..823e3cdb876 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -72,7 +72,6 @@ Module400Desc=Projektmanagement, Aufträge oder Leads. Anschliessend können Sie
 Module1200Desc=Mantis-Integation
 Module2000Desc=Texte mit dem WYSIWYG Editor bearbeiten (Basierend auf CKEditor)
 Module3100Desc=Skypebutton bei Kontakten / Drittparteien / Mitgliedern hinzufügen
-Module10000Desc=Erstellen Sie öffentliche Webauftritte mit einem WYSIWIG Editor. Konfigurieren Sie dazu Ihren Webserver so, dass es auf das dedizierte Verzeichnis zeigt um den Webauftritt öffentlich zugänglich zu machen.
 Module50100Desc=Kassenmodul
 Module63000Desc=Resourcen verwalten(Drucker, Autos, Räume,...) diese können dann im Kalender verwendet werden
 Permission26=Angebote schliessen
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 8c516b8048c..bd7b59c1730 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -101,6 +101,8 @@ ClassifyBilled=Verrechnet
 Progress=Fortschritt
 BackOffice=Dolibarr
 Calendar=Kalender
+Website=Website
+ExpenseReports=Spesenrapporte
 EMailTemplates=Textvorlagen für Emails
 ShortTuesday=D
 ShortWednesday=M
diff --git a/htdocs/langs/de_CH/trips.lang b/htdocs/langs/de_CH/trips.lang
index 551a060aaf2..a2725b67289 100644
--- a/htdocs/langs/de_CH/trips.lang
+++ b/htdocs/langs/de_CH/trips.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReports=Spesenabrechnungen Hinweis
 ShowExpenseReport=Spesenreport anzeigen
 TripCard=Reisekosten Karte
 ListOfTrips=Liste Reise- und Spesenabrechnungen
diff --git a/htdocs/langs/de_CH/website.lang b/htdocs/langs/de_CH/website.lang
index 77f8d74333c..a2deb6f91a8 100644
--- a/htdocs/langs/de_CH/website.lang
+++ b/htdocs/langs/de_CH/website.lang
@@ -4,7 +4,6 @@ DeleteWebsite=Webseite löschen
 ConfirmDeleteWebsite=Möchten sie wirklich diesen Webauftritt löschen? Alle Seiten und Inhalte werden dadurch auch gelöscht.
 WEBSITE_CSS_URL=URL zu externer CSS Datei
 EditPageMeta=Metadaten bearbeiten
-Website=Website
 PreviewOfSiteNotYetAvailable=Vorschau des Webauftritt <strong>%s</strong> noch nicht verfügbar. Sie müssen zuerst eine Seite hinzufügen.
 ViewSiteInNewTab=Webauftritt in neuem Tab anzeigen
 SetAsHomePage=Als Startseite definieren
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 61f35b0f32a..9376eafe55c 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Doppelte Zeilen Fehler ignorieren (INSERT IGNORE)
 AutoDetectLang=Automatische Erkennung (Browser-Sprache)
 FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
 FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
-Rights=Berechtigungen
 BoxesDesc=Boxen sind auf einigen Seiten angezeigte Informationsbereiche. Sie können die Anzeige einer Box einstellen, indem Sie auf die Zielseite klicken und 'Aktivieren' wählen. Zum Ausblenden einer Box klicken Sie einfach auf den Papierkorb.
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
 ModulesDesc=Die Module bestimmen, welche Funktionalität in Dolibarr verfügbar ist. Manche Module erfordern zusätzlich Berechtigungen die Benutzern zugewiesen werden muss, nachdem das Modul aktiviert wurde. \nKlicken Sie auf die Schaltfläche on/off, um ein Modul/Anwendung zu aktivieren. 
@@ -593,7 +592,7 @@ Module5000Desc=Ermöglicht Ihnen die Verwaltung mehrerer Firmen
 Module6000Name=Workflow
 Module6000Desc=Workflow Management
 Module10000Name=Webseiten
-Module10000Desc=Erstelle öffentliche Webseiten mit dem WYSIWYG-Editor.\nDer Webserver muss auf das Verzeichnis verweisen. 
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Urlaubsantrags-Verwaltung
 Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten.
 Module39000Name=Chargen-/ Seriennummern
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature-Mails mit der Methode "PHP mail direkt" s
 TranslationSetup=Konfiguration der Übersetzung
 TranslationKeySearch=Übersetzungsschlüssel oder -Zeichenkette suchen
 TranslationOverwriteKey=Überschreiben der Übersetzung
-TranslationDesc=Angezeichten Systemsprachen einstellen:<br>* Systemweit: Menü <strong>Start - Konfiguration - Anzeigen</strong><br>* Nach Benutzer: <strong>Benutzer konfigurieren</strong>Benutzer Karteireiter (Benutzername anklicken ganz oben auf dem Bildschirm).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=Sie können Zeichenketten durch Füllen der folgenden Tabelle überschreiben. Wählen Sie Ihre Sprache aus dem "%s" Drop-Down und tragen Sie den Schlüssel in "%s" und Ihre neue Übersetzung in "%s" ein.
 TranslationOverwriteDesc2=Sie können die andere Registerkarte verwenden, um Ihnen zu helfen, den Übersetzungsschlüssel zu verwenden
 TranslationString=Übersetzung Zeichenkette
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Regel für automatisch erstellte Passwörter
 DisableForgetPasswordLinkOnLogonPage='Passwort vergessen'-Link nicht auf der Anmeldeseite anzeigen
 UsersSetup=Benutzermoduleinstellungen
 UserMailRequired=Für das Erstellen eines neuen Benutzers ist dessen E-Mail-Adresse erforderlich
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=PV Modul Einstellungen
 ##### Company setup #####
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index 1429836426a..d9a87578d0e 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -70,3 +70,9 @@ Stats=Verkaufsstatistik
 StatusProsp=Lead Status
 DraftPropals=Entworfene Angebote
 NoLimit=Kein Limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index e4fd3b57871..65e6e85deff 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Urlaubsantrag stornieren
 EmployeeLastname=Mitarbeiter Nachname
 EmployeeFirstname=Vorname des Mitarbeiters
 TypeWasDisabledOrRemoved=Abreise-Art (Nr %s) war deaktiviert oder entfernt
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Letzte automatische Aktualisierung der Urlaubstage
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 1c2e7bf3f72..7918674860b 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Einzigartige Partnerkontakte
 MailNoChangePossible=Die Empfängerliste einer freigegebenen E-Mail Kampagne kann nicht mehr geändert werden
 SearchAMailing=Suche E-Mail Kampagne
 SendMailing=E-Mail Kampagne versenden
-SendMail=sende E-Mail
 SentBy=Gesendet von
 MailingNeedCommand=Aus Sicherheitsgründen sollten E-Mails von der Kommandozeile aus versandt werden. Bitten Sie Ihren Server Administrator um die Ausführung des folgenden Befehls, um den Versand an alle Empfänger zu starten:
 MailingNeedCommand2=Sie können den Versand jedoch auch online starten, indem Sie den Parameter MAILING_LIMIT_SENDBYWEB auf den Wert der pro Sitzung gleichzeitig zu versendenden Mails setzen. Die entsprechenden Einstellungen finden Sie unter Übersicht-Einstellungen-Andere.
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 77ad8074553..adeab4ba132 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Genehmigungsdatum (zweite Genehmigung)
 RegistrationDate=Registration date
 UserCreation=Erzeugungs-Benutzer
 UserModification=Aktualisierungs-Benutzer
+UserValidation=Validation user
 UserCreationShort=Erzeuger
 UserModificationShort=Aktualisierer
+UserValidationShort=Valid. user
 DurationYear=Jahr
 DurationMonth=Monat
 DurationWeek=Woche
@@ -608,6 +610,7 @@ SendByMail=Per E-Mail versenden
 MailSentBy=E-Mail Absender
 TextUsedInTheMessageBody=E-Mail Text
 SendAcknowledgementByMail=Bestätigungsmail senden
+SendMail=sende E-Mail
 EMail=E-Mail
 NoEMail=Keine E-Mail
 Email=E-Mail
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Währung festlegen
 BulkActions=Massenaktionen
 ClickToShowHelp=Klicken um die Tooltiphilfe anzuzeigen
+Website=Webseite
+WebSites=Web sites
+ExpenseReport=Spesenabrechnung
+ExpenseReports=Spesenabrechnungen
 HR=Personalabteilung
 HRAndBank=HR und Bank
 AutomaticallyCalculated=Automatisch berechnet
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Ereignisse
 EMailTemplates=Textvorlagen für E-Mails
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projekte
+Rights=Berechtigungen
 # Week day
 Monday=Montag
 Tuesday=Dienstag
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index d4b777b1726..633e232258f 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Umsatz (für eine Firma) oder Budget (für eine Stiftung)
 DefaultAmount=Standardbetrag für ein Abonnement
 CanEditAmount=Besucher können die Höhe auswählen oder ändern für den Beitrag
 MEMBER_NEWFORM_PAYONLINE=Gehen Sie zu integrierten Bezahlseite
-ByProperties=nach Eigenschaften
-MembersStatisticsByProperties=Mitgliederstatistik nach Eigenschaften
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Dieser Bildschirm zeigt ihre Statistiken über ihre Mitgliedschaft.
 MembersByRegion=Dieser Bildschirm zeigt Ihnen Statistiken über Mitglieder nach Regionen.
 VATToUseForSubscriptions=Mehrwertsteuersatz für Mitgliedschaften
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 9c01ee74c7a..36ae43a046a 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -3,8 +3,6 @@ RefProject=Projekt-Nr.
 ProjectRef=Chance
 ProjectId=Projekt-ID
 ProjectLabel=Projektbezeichnung
-Project=Projekt
-Projects=Projekte
 ProjectsArea=Projektübersicht
 ProjectStatus=Projekt Status
 SharedProject=Jeder
@@ -38,6 +36,7 @@ OpenedTasks=Offene Aufgaben
 OpportunitiesStatusForOpenedProjects=Betrag Verkaufschancen offene Projekt nach Status
 OpportunitiesStatusForProjects=Betrag Verkaufschancen pro Projekt nach Status
 ShowProject=Zeige Projekt
+ShowTask=Zeige Aufgabe
 SetProject=Projekt setzen
 NoProject=Kein Projekt definiert oder keine Rechte
 NbOfProjects=Anzahl der Projekte
@@ -77,6 +76,7 @@ Time=Zeitaufwand
 ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
 GoToListOfTasks=Liste der Aufgaben aufrufen
+GanttView=Gantt View
 ListProposalsAssociatedProject=Liste Angebote, die mit diesem Projekt verknüpft sind
 ListOrdersAssociatedProject=Liste der mit diesem Projekt verbundenen Kunden-Bestellungen
 ListInvoicesAssociatedProject=Liste der mit diesem Projekt verbundenen Kunden-Rechnungen
@@ -108,6 +108,7 @@ AlsoCloseAProject=Das Projekt auch schließen (lassen Sie es offen, wenn Sie noc
 ReOpenAProject=Projekt öffnen
 ConfirmReOpenAProject=Möchten Sie dieses Projekt wirklich wiedereröffnen?
 ProjectContact=Projekt Kontakte
+TaskContact=Task contacts
 ActionsOnProject=Projektaktionen
 YouAreNotContactOfProject=Sie sind diesem privaten Projekt nicht als Kontakt zugeordnet.
 UserIsNotContactOfProject=Benutzer ist kein Kontakt dieses privaten Projektes
@@ -115,7 +116,7 @@ DeleteATimeSpent=Lösche einen Zeitaufwand
 ConfirmDeleteATimeSpent=Sind Sie sicher, dass diesen Zeitaufwand löschen wollen?
 DoNotShowMyTasksOnly=Zeige auch die Aufgaben der Anderen
 ShowMyTasksOnly=Zeige nur meine Aufgaben
-TaskRessourceLinks=Ressourcen
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Mit diesem Partner verknüpfte Projekte
 NoTasks=Keine Aufgaben für dieses Projekt
 LinkedToAnotherCompany=Mit Partner verknüpft
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index 748ec45c014..bcbdab8543d 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -13,3 +13,5 @@ TJM=Durchschnittlicher Tagessatz
 CurrentSalary=aktueller  Lohn
 THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die verbrauchte Zeit eines Anwender zu berechnen, wenn das Modul Projektverwaltung verwendet wird,
 TJMDescription=Dieser Wert ist aktuell nur zu Informationszwecken und wird nicht für eine Berechnung verwendet
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 0268047a27e..54fb5af5020 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -22,6 +22,7 @@ Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
 ListOfWarehouses=Liste der Warenlager
 ListOfStockMovements=Liste der Lagerbewegungen
+MovementId=Movement ID
 StockMovementForId=Lagerbewegung Nr. %d
 ListMouvementStockProject=Lagerbewegungen für Projekt
 StocksArea=Warenlager - Übersicht
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Der Lagerbestand muss ausreichend sein um ein Produk
 StockMustBeEnoughForOrder=Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zum Auftrag hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.)
 StockMustBeEnoughForShipment= Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zum Versand hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.)
 MovementLabel=Titel der Lagerbewegung
+DateMovement=Date of movement
 InventoryCode=Bewegungs- oder Bestandscode
 IsInPackage=In Paket enthalten
 WarehouseAllowNegativeTransfer=Bestand kann negativ sein
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index d477271f379..24733634237 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Spesenabrechnung
-ExpenseReports=Spesenabrechnungen
 ShowExpenseReport=Spesenabrechnung anzeigen
 Trips=Spesenabrechnungen
 TripsAndExpenses=Reise- und Fahrtspesen
@@ -12,6 +10,8 @@ ListOfFees=Liste der Spesen
 TypeFees=Gebührenarten
 ShowTrip=Spesenabrechnung anzeigen
 NewTrip=neue Spesenabrechnung
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Besuchter Partner
 FeesKilometersOrAmout=Spesenbetrag bzw. Kilometergeld
 DeleteTrip=Spesenabrechnung löschen
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Sie haben bereits eine andere Spesenabrechnung in einem ähnlichen Datumsbereich erstellt.
 AucuneLigne=Es wurde noch keine Spesenabrechnung erstellt.
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 45d5ec0a0b7..041a3be819c 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Website löschen
 ConfirmDeleteWebsite=Möchten Sie diese Website wirklich löschen? Alle Seiten inkl. Inhalt werden auch gelöscht.
 WEBSITE_PAGENAME=Seitenname/Alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL der externen CSS-Datei
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Menü bearbeiten
 EditMedias=Edit medias
 EditPageMeta=Meta bearbeiten
-Website=Webseite
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/el_CY/admin.lang b/htdocs/langs/el_CY/admin.lang
index 1c53b65c99c..f38aa12680e 100644
--- a/htdocs/langs/el_CY/admin.lang
+++ b/htdocs/langs/el_CY/admin.lang
@@ -2,3 +2,5 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index e31910dd20a..8fb86ad1306 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Αυτόματη Ανίχνευση (γλώσσα φυλλομετρητή)
 FeatureDisabledInDemo=Δυνατότητα απενεργοποίησης στο demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Δικαιώματα
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Μόνο στοιχεία από <a href="%s">ενεργοποιημένα modules</a> προβάλλονται.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Σας επιτρέπει να διαχειριστήτε πολ
 Module6000Name=Ροή εργασίας
 Module6000Desc=Διαχείρισης Ροών Εργασιών
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Αφήστε τη διαχείριση των ερωτήσεων
 Module20000Desc=Δηλώστε και παρακολουθήστε τις αιτήσεις αδειών των εργαζομένων
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Εγκατάσταση της μετάφρασης
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Ρυθμίσεις αρθρώματος χρηστών
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index f4ec947a882..0ad3781d5cd 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -70,3 +70,9 @@ Stats=Στατιστικά πωλήσεων
 StatusProsp=Κατάσταση προοπτικής
 DraftPropals=Σχέδιο εμπορικών προσφορών
 NoLimit=Κανένα όριο
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index 9b8b1d8d848..24fff5af365 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Αφήστε το αίτημα ακύρωσης
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index f9443a74cbd..1210892e7cc 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Μοναδικές επαφές/διευθύνσεις
 MailNoChangePossible=Παραλήπτες με επικυρωμένες ηλεκτρονικές διευθύνσεις δεν μπορούν να αλλάξουν
 SearchAMailing=Αναζήτηση Ταχυδρομείου
 SendMailing=Αποστολή ηλεκτρονικού ταχυδρομείου
-SendMail=Αποστολή email
 SentBy=Στάλθηκε από
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Μπορείτε, ωστόσο, να τους στείλετε σε απευθείας σύνδεση με την προσθήκη της παραμέτρου MAILING_LIMIT_SENDBYWEB με την αξία του μέγιστου αριθμού των μηνυμάτων ηλεκτρονικού ταχυδρομείου που θέλετε να στείλετε από τη συνεδρία. Για το σκοπό αυτό, πηγαίνετε στο Αρχική - Ρυθμίσεις - Άλλες Ρυθμίσεις.
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 66115ec9d40..ba5d1c3ea39 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Ημερομηνία έγκρισης (δεύτερο έγκρισ
 RegistrationDate=Registration date
 UserCreation=Χρήστης δημιουργίας
 UserModification=Χρήστης τροποποίησης
+UserValidation=Validation user
 UserCreationShort=Δημιουργία χρήστη
 UserModificationShort=Τροποποιών χρήστης
+UserValidationShort=Valid. user
 DurationYear=έτος
 DurationMonth=μήνας
 DurationWeek=εβδομάδα
@@ -608,6 +610,7 @@ SendByMail=Αποστολή με email
 MailSentBy=Το email στάλθηκε από
 TextUsedInTheMessageBody=Κείμενο email
 SendAcknowledgementByMail=Αποστολή email επιβεβαίωσης
+SendMail=Αποστολή email
 EMail=E-mail
 NoEMail=Χωρίς email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Ιστοτοπός
+WebSites=Web sites
+ExpenseReport=Αναφορά εξόδων
+ExpenseReports=Αναφορές εξόδων
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Ενέργειες
 EMailTemplates=Πρότυπα email
 FileNotShared=File not shared to exernal public
+Project=Έργο
+Projects=Έργα
+Rights=Άδειες
 # Week day
 Monday=Δευτέρα
 Tuesday=Τρίτη
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 26c150dc6fd..5aac15ca957 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Κύκλος εργασιών (για μια επιχείρησ
 DefaultAmount=Προεπιλογή ποσό της συνδρομής
 CanEditAmount=Επισκέπτης μπορεί να επιλέξει / επεξεργαστείτε το ποσό της συνδρομής του
 MEMBER_NEWFORM_PAYONLINE=Μετάβαση στην ολοκληρωμένη ηλεκτρονική σελίδα πληρωμής
-ByProperties=Με χαρακτηριστικά
-MembersStatisticsByProperties=Στατιστικά στοιχεία μελων από τα χαρακτηριστικά
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη του από τη φύση τους.
 MembersByRegion=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη κατά περιοχή.
 VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index 55ce2f1751c..cd3ab5a131a 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 3312f27c393..17434585703 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -3,8 +3,6 @@ RefProject=Κωδ. έργου
 ProjectRef=Project ref.
 ProjectId=Id Έργου
 ProjectLabel=Project label
-Project=Έργο
-Projects=Έργα
 ProjectsArea=Περιοχή έργων
 ProjectStatus=Κατάσταση έργου
 SharedProject=Όλοι
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Εμφάνιση έργου
+ShowTask=Εμφάνιση Εργασίας
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Αριθμός έργων
@@ -77,6 +76,7 @@ Time=Χρόνος
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Κατάλογος των εμπορικών προτάσεων που σχετίζονται με το έργο
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Άνοιγμα έργου
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Επαφές Project
+TaskContact=Task contacts
 ActionsOnProject=Δράσεις για το έργο
 YouAreNotContactOfProject=Δεν έχετε μια επαφή του ιδιωτικού έργου,
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Διαγράψτε το χρόνο που δαπανάται
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Δείτε επίσης τα καθήκοντα που δεν ανατέθηκαν σε μένα
 ShowMyTasksOnly=Δείτε τα καθήκοντα που σας έχουν ανατεθεί
-TaskRessourceLinks=Πόροι
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Έργα που αφορούν αυτό το στοιχείο
 NoTasks=Δεν υπάρχουν εργασίες για αυτό το έργο
 LinkedToAnotherCompany=Συνδέεται με άλλο τρίτο μέρος
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index e89361ff944..a1a700cd206 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Τρέχον μισθός
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=Αυτή η τιμή εμφανίζεται μόνο σαν πληροφορία και δεν χρησιμοποιείται για κανένα υπολογισμό
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 71cd5f4b7b4..a0560279a5e 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -22,6 +22,7 @@ Movements=Κινήματα
 ErrorWarehouseRefRequired=Αποθήκη όνομα αναφοράς απαιτείται
 ListOfWarehouses=Κατάλογος των αποθηκών
 ListOfStockMovements=Κατάλογος των κινήσεων των αποθεμάτων
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Περιοχή αποθηκών
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Ετικέτα λογιστικής κίνησης
+DateMovement=Date of movement
 InventoryCode=Λογιστική κίνηση ή κωδικός απογραφής
 IsInPackage=Περιεχόμενα συσκευασίας
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index e2ff3176053..1627fee0e14 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Αναφορά εξόδων
-ExpenseReports=Αναφορές εξόδων
 ShowExpenseReport=Εμφάνιση αναφοράς εξόδων
 Trips=Αναφορές εξόδων
 TripsAndExpenses=Αναφορές εξόδων
@@ -12,6 +10,8 @@ ListOfFees=Λίστα φόρων
 TypeFees=Types of fees
 ShowTrip=Εμφάνιση αναφοράς εξόδων
 NewTrip=Νέα αναφορά εξόδων
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Σύνολο χλμ
 DeleteTrip=Διαγραφή αναφοράς εξόδων
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index b565b17e6b2..e1d43ef4c1f 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Διαγραφή ιστοχώρου
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Επεξεργασία μενού
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Ιστοτοπός
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index c353d325e3f..bca9b03aca3 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -5,6 +5,8 @@ ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<
 HideAnyVATInformationOnPDF=Hide all information related to GST on generated PDF
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 DictionaryVAT=GST Rates or Sales Tax Rates
 VATManagement=GST Management
 VATIsNotUsedDesc=By default the proposed GST rate is 0 which can be used for cases like associations, individuals and small companies.
@@ -13,5 +15,7 @@ LocalTax1IsNotUsedDesc=Do not use other type of tax (other than GST)
 LocalTax2IsUsedDesc=Use a third type of tax (other than GST)
 LocalTax2IsNotUsedDesc=Do not use other type of tax (other than GST)
 OptionVatMode=GST due
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
 TextTitleColor=Colour of page title
 LinkColor=Colour of links
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 9bf5497f19b..7675bb94703 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -2,8 +2,12 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 VATManagement=GST Management
 LocalTax1IsUsedDesc=Use a second tax (PST)
 LocalTax1IsNotUsedDesc=Do not use second tax (PST)
 LocalTax1Management=PST Management
 LocalTax2IsNotUsedDesc=Do not use second tax (PST)
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 85d20550ec8..48129f9cf53 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -32,10 +32,14 @@ CommandsToDisableForeignKeysForImportWarning=This is mandatory if you want to re
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party The Company, with date 2007-01-31:</u><br>
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module330Desc=Bookmark management
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
 Module50200Name=PayPal
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Permission300=Read barcodes
 Permission301=Create/modify barcodes
 Permission302=Delete barcodes
 DictionaryAccountancyJournal=Finance journals
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to automatically generate codes, you must first set a rule to define the barcode number.
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index d89326427cb..1e0ab2069a7 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -1,7 +1,22 @@
 # Dolibarr language file - Source file is en_US - bills
+InvoiceDeposit=Deposit invoice
+InvoiceDepositAsk=Deposit invoice
+InvoiceDepositDesc=This kind of invoice is raised when a deposit has been received.
 InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only an invoice with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+ConfirmConvertToReduc=Do you want to convert this %s into an absolute discount ?<br>The amount will be saved and can be used as a discount for a current or a future invoice for this customer.
+PaymentsBackAlreadyDone=Refunds already done
+PaymentHigherThanReminderToPay=Payment higher than balance outstanding
+HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the balance outstanding. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
+ConvertToReduc=Convert to future discount
 ErrorVATIntraNotConfigured=Intracommunitary VAT number not yet defined
-EscompteOffered=Dscnt.offered (pay.befor.term)
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too high because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmValidatePayment=Are you sure you want to validate this payment? No changes can be made once payment is validated.
+ShowInvoiceDeposit=Show deposit invoice
+AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits)
+EscompteOffered=Disc. offered (early pmt)
+Deposit=Deposit
+Deposits=Deposits
+DiscountFromDeposit=Payments from deposit invoice %s
 PaymentTypeCHQ=Cheque
 PaymentTypeShortCHQ=Cheque
 ChequeNumber=Cheque N°
@@ -20,3 +35,6 @@ ChequesArea=Cheque deposits area
 ChequeDeposits=Cheque deposits
 Cheques=Cheques
 NbCheque=Number of cheques
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, deposit or replacement invoices entirely paid.
+MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for deposit invoices where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index f152c0ce69d..67b167fff2e 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -49,3 +49,4 @@ Color=Colour
 Informations=Information
 AccordingToGeoIPDatabase=(according to GeoIP lookup)
 NoPhotoYet=No picture available yet
+Website=Website
diff --git a/htdocs/langs/en_GB/website.lang b/htdocs/langs/en_GB/website.lang
index f4230d97ddd..45efd3453c6 100644
--- a/htdocs/langs/en_GB/website.lang
+++ b/htdocs/langs/en_GB/website.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - website
 WebsiteSetupDesc=Create here as many entries for websites as you need. Then go into menu Websites to edit them.
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge an SEO URL when the website is run from a Virtual host of a Web server (like Apache, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-Website=Website
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> is not yet available. You must first add a page.
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 9e01f754dbe..df631435252 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -4,6 +4,8 @@ AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module20Name=Quotations
 Module20Desc=Management of quotations
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Permission21=Read quotations
 Permission22=Create/modify quotations
 Permission24=Validate quotations
@@ -17,3 +19,5 @@ ProposalsPDFModules=Quotation documents models
 FreeLegalTextOnProposal=Free text on quotations
 WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
 FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (quotations, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 1c53b65c99c..dcc95ac6ab5 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -2,3 +2,7 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index 1c53b65c99c..dcc95ac6ab5 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -2,3 +2,7 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 87ab27f19fd..abc69871bde 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -17,6 +17,8 @@ SetupShort=Configurar
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module20Name=Cotizaciones
 Module20Desc=Gestión de cotizaciones/propuestas comerciales
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Permission21=Consultar cotizaciones
 Permission22=Crear/modificar cotizaciones
 Permission24=Validar cotizaciones
@@ -32,3 +34,5 @@ ProposalsPDFModules=Modelos de documentos de cotizaciones
 FreeLegalTextOnProposal=Texto libre en cotizaciones
 WatermarkOnDraftProposal=Marca de agua en cotizaciones borrador (en caso de estar vacío)
 FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, cotizaciones, facturas, etc.)
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index a07b67603b4..b18be3db335 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -7,6 +7,10 @@ SetupShort=Configuración
 Position=Puesto
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module42Name=Log
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 DictionaryCanton=Departamento
 LTRate=Tipo
 CompanyName=Nombre
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 46365249827..37015081f32 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -5,6 +5,8 @@ ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el ITBIS en la generación de los PDF
 OldVATRates=Tasa de ITBIS antigua
 NewVATRates=Tasa de ITBIS nueva
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Permission91=Consultar impuestos e ITBIS
 Permission92=Crear/modificar impuestos e ITBIS
 Permission93=Eliminar impuestos e ITBIS
@@ -22,3 +24,5 @@ OptionVatMode=Opción de carga de ITBIS
 OptionVatDefaultDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
 SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad de ITBIS por defecto según la opción eligida
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 368d85b9fb9..0354ed19116 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -464,7 +464,7 @@ Module5000Desc=Permite gestionar múltiples empresas
 Module6000Name=Flujo de Trabajo
 Module6000Desc=Administración de flujo de trabajo
 Module10000Name=Sitios Web
-Module10000Desc=Cree sitios web públicos con un editor WYSIWYG. Sólo tiene que configurar su servidor web para que apunte al directorio dedicado para tenerlo en línea en Internet.
+Module10000Desc=Cree sitios web públicos con un editor WYSIWYG. Simplemente configure su servidor web (Apache, Nginx, ...) para que apunte al directorio dedicado de Dolibarr para tenerlo en línea en Internet con su propio nombre de dominio.
 Module20000Name=Administración de solicitudes de permisos
 Module20000Desc=Declare y siga las solicitudes de los empleados
 Module39000Name=Lote de producto
@@ -881,7 +881,7 @@ SendmailOptionMayHurtBuggedMTA=Función para enviar correos usando el método "P
 TranslationSetup=Configuración de la traducción
 TranslationKeySearch=Buscar una clave o cadena de traducción
 TranslationOverwriteKey=Sobrescribir una cadena de traducción
-TranslationDesc=Cómo configurar el idioma de la aplicación que se muestra:<br>* Todo el sistema: menú <strong>Inicio - Configuración - Entorno</strong><br>* Por usuario: <strong>Configuración de la pantalla de usuario</strong> de la tarjeta de usuario (haga clic en nombre de usuario en la parte superior de la pantalla).
+TranslationDesc=Cómo configurar el idioma de la aplicación: <br> * Systemwide: menú <strong>Inicio - Configuración - Pantalla</strong><br> * Por usuario: utilice la <strong>pestaña de configuración de visualización</strong>del usuario en la tarjeta de usuario (haga clic en username en la parte superior de la pantalla).
 TranslationOverwriteDesc=También puede reemplazar cadenas de llenado de la siguiente tabla. Cambiar la lengua del menú desplegable "% s", insertar la cadena de clave traducción a "% s" y su nueva traducción a "% s"
 TranslationOverwriteDesc2=Puede utilizar la otra pestaña para ayudarle a saber la clave de traducción que desea utilizar
 TranslationString=Cadena de traducción
@@ -918,7 +918,6 @@ RuleForGeneratedPasswords=Regla para generar contraseñas sugeridas o validar co
 DisableForgetPasswordLinkOnLogonPage=No mostrar el enlace "Contraseña olvidada" en la página de inicio de sesión
 UsersSetup=Configuración de módulos de usuario
 UserMailRequired=Se requiere correo electrónico para crear un nuevo usuario
-DefaultCategoryCar=Categoría de auto predeterminada
 HRMSetup=Configuración del módulo de RRHH (Recursos Humanos)
 CompanySetup=Configuración del módulo de empresas
 CompanyCodeChecker=Módulo de generación y comprobación de códigos de cliente / proveedor (cliente o proveedor)
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 52c4fae0ffb..41b42818655 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -156,8 +156,10 @@ DatePayment=Fecha del pago
 RegistrationDate=Fecha de Registro
 UserCreation=Creación de usuarios
 UserModification=Modificación de usuario
+UserValidation=Usuario de validación
 UserCreationShort=Creación de usuarios
 UserModificationShort=Modificación de usuario
+UserValidationShort=Usuario válido.
 Morning=Temprano
 Rate=Tarifa
 UseLocalTax=Incluye impuestos
@@ -340,6 +342,7 @@ SendByMail=Enviar por correo electrónico
 MailSentBy=Correo electrónico enviado por
 TextUsedInTheMessageBody=Cuerpo del correo electronico
 SendAcknowledgementByMail=Enviar correo electrónico de confirmación
+SendMail=Enviar correo electrónico
 EMail=Correo electrónico
 NoEMail=Sin correo electrónico
 Email=Correo electrónico
@@ -455,6 +458,9 @@ DirectDownloadLink=Enlace de descarga directa (público/externo)
 ActualizeCurrency=Actualizar tipo de cambio
 ModuleBuilder=Generador de módulos
 ClickToShowHelp=Haga clic para mostrar ayuda sobre herramientas
+WebSites=Sitios Web
+ExpenseReport=Informe de gastos
+ExpenseReports=Reporte de gastos
 HRAndBank=HR y Banco
 TitleSetToDraft=Volver al borrador
 ConfirmSetToDraft=¿Seguro que desea volver al estado de borrador?
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 1825d531dc9..f5d42301813 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignorar los errores por registro duplicado (INSERT IGNORE
 AutoDetectLang=Autodetección (navegador)
 FeatureDisabledInDemo=Opción deshabilitada en demo
 FeatureAvailableOnlyOnStable=Funcionaliad disponible únicamente en versiones oficiales estables
-Rights=Permisos
 BoxesDesc=Los paneles son componentes que muestran algunos datos que pueden añadirse para personalizar algunas páginas. Puede elegir entre mostrar o no el panel mediante la selección de la página de destino y haciendo clic en 'Activar', o haciendo clic en la papelera para desactivarlo.
 OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados.
 ModulesDesc=Los módulos de Dolibarr definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de encendido/apagado para activar un módulo/función.
@@ -260,17 +259,17 @@ Content=Contenido
 NoticePeriod=Plazo de aviso
 NewByMonth=Nuevo por mes
 Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
+EMailsSetup=Configuración emails
+EMailsDesc=Esta página le permite sobrescribir sus parámetros de PHP para el envío de correos electrónicos. En la mayoría de los casos, en el sistema operativo Unix/Linux, su configuración de PHP es correcta y estos parámetros son inútiles.
 EmailSenderProfiles=Emails sender profiles
 MAIN_MAIL_SMTP_PORT=Puerto del servidor SMTP (Por defecto en php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Nombre host o ip del servidor SMTP (Por defecto en php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Puerto del servidor SMTP (No definido en PHP en sistemas de tipo Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nombre servidor o ip del servidor SMTP (No definido en PHP en sistemas de tipo Unix)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_EMAIL_FROM=Correo electrónico del remitente para correos electrónicos automáticos (por defecto en php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Correo electrónico del remitente utilizado para los correos electrónicos de error enviados
 MAIN_MAIL_AUTOCOPY_TO= Enviar automáticamente copia oculta de los e-mails enviados a
-MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_DISABLE_ALL_MAILS=Deshabilitar todos los envíos de correos electrónicos (para propósitos de prueba o demostraciones)
 MAIN_MAIL_SENDMODE=Método de envío de e-mails
 MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP  si se requiere autenticación SMTP
 MAIN_MAIL_SMTPS_PW=Contraseña autentificación SMTP si se requiere autentificación SMTP
@@ -593,7 +592,7 @@ Module5000Desc=Permite gestionar varias empresas
 Module6000Name=Flujo de trabajo
 Module6000Desc=Gestión del flujo de trabajo
 Module10000Name=Sitios web
-Module10000Desc=Cree sitios web públicos con un editor WYSIWYG. Configure el servidor web para que apunte al directorio dedicado para tenerlo en línea en Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Gestión de días libres retribuidos
 Module20000Desc=Gestión de los días libres retribuidos de los empleados
 Module39000Name=Lotes de producto
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=La funcionalidad de enviar correo electrónico a
 TranslationSetup=Configuración de traducciones
 TranslationKeySearch=Buscar una clave de traducción o cadena
 TranslationOverwriteKey=Sobreescribir una cadena traducida
-TranslationDesc=Cómo se establece el idioma de la aplicación a usar: :<br>* Sistema: menu <strong>Inicio - Configuración - Entorno</strong><br>* Por usario: pestaña <strong>Interfaz usuario</strong> de la ficha del usuario (clic en el nombre de usuario en la parte superior de la pantalla).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=También puede reemplazar cadenas llenando la tabla siguiente. Elija su idioma en la lista desplegable "%s",  inserte la clave de la traducción en "%s" y su nueva traducción en "%s"
 TranslationOverwriteDesc2=Puede utilizar otra pestaña para ayudarle a saber clave a utilizar
 TranslationString=Cadena traducida
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Norma para la generación de las contraseñas propuest
 DisableForgetPasswordLinkOnLogonPage=No mostrar el vínculo "Contraseña olvidada" en la página de login
 UsersSetup=Configuración del módulo usuarios
 UserMailRequired=E-Mail necesario para crear un usuario nuevo
-DefaultCategoryCar=Categoría de coche predeterminada
-DefaultRangeNumber=Número de rango predeterminado
 ##### HRM setup #####
 HRMSetup=Setup del módulo RRHH
 ##### Company setup #####
diff --git a/htdocs/langs/es_ES/commercial.lang b/htdocs/langs/es_ES/commercial.lang
index dc6ae6ee765..2ddf8f010ec 100644
--- a/htdocs/langs/es_ES/commercial.lang
+++ b/htdocs/langs/es_ES/commercial.lang
@@ -70,3 +70,9 @@ Stats=Estadísticas de venta
 StatusProsp=Estado prospección
 DraftPropals=Presupuestos borrador
 NoLimit=Sin límite
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index a7e628629b2..e416c5667b7 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Anulación días libres
 EmployeeLastname=Apellidos del empleado
 EmployeeFirstname=Nombre del empleado
 TypeWasDisabledOrRemoved=El tipo de día libre (id %s) ha sido desactivado o eliminado
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Última actualización automática de días retribuidos
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 52bcd364c59..869b19ed1f8 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Contactos/direcciones únicos
 MailNoChangePossible=Destinatarios de un E-Mailing validado no modificables
 SearchAMailing=Buscar un E-Mailing
 SendMailing=Enviar E-Mailing
-SendMail=Enviar e-mail
 SentBy=Enviado por
 MailingNeedCommand=El envío de un e-mailing puede realizarse desde la línea de comandos. Solicite al administrador del servidor que ejecute el siguiente comando para enviar el e-mailling a todos los destinatarios:
 MailingNeedCommand2=Puede enviar en línea añadiendo el parámetro MAILING_LIMIT_SENDBYWEB con un valor numérico que indica el máximo nº de e-mails a enviar por sesión. Para ello vaya a Inicio - Configuración - Varios.
@@ -115,7 +114,7 @@ DeliveryReceipt=Acuse de recibo.
 YouCanUseCommaSeparatorForSeveralRecipients=Puede usar el carácter de separación <b>coma </b> para especificar múltiples destinatarios.
 TagCheckMail=Seguimiento de la apertura del email
 TagUnsubscribe=Link de desuscripción
-TagSignature=Signature of sending user
+TagSignature=Firma del usuario que envía
 EMailRecipient=Email del destinatario
 TagMailtoEmail=Email del destinatario (incluyendo el enlace html "mailto:")
 NoEmailSentBadSenderOrRecipientEmail=No se ha enviado el e-mail. El remitente o destinatario es incorrecto. Compruebe los datos del usuario.
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index f1b064314f1..7311d577e17 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Fecha de aprobación (segunda aprobación)
 RegistrationDate=Registration date
 UserCreation=Usuario creador
 UserModification=Usuario modificador
+UserValidation=Validation user
 UserCreationShort=U. Crea.
 UserModificationShort=U. Modif.
+UserValidationShort=Valid. user
 DurationYear=año
 DurationMonth=mes
 DurationWeek=semana
@@ -608,6 +610,7 @@ SendByMail=Enviar por e-mail
 MailSentBy=Mail enviado por
 TextUsedInTheMessageBody=Texto utilizado en el cuerpo del mensaje
 SendAcknowledgementByMail=Enviar email de confirmación
+SendMail=Enviar e-mail
 EMail=E-mail
 NoEMail=Sin e-mail
 Email=Correo
@@ -808,6 +811,10 @@ ModuleBuilder=Módulo Builder
 SetMultiCurrencyCode=Establecer moneda
 BulkActions=Acciones masivas
 ClickToShowHelp=Haga clic para mostrar la ayuda sobre herramientas
+Website=Sitio web
+WebSites=Sitios web
+ExpenseReport=Gasto
+ExpenseReports=Informes de gastos
 HR=RRHH
 HRAndBank=RRHH y bancos
 AutomaticallyCalculated=Calculado automáticamente
@@ -818,6 +825,9 @@ Websites=Sitios web
 Events=Eventos
 EMailTemplates=Plantillas E-Mails
 FileNotShared=Archivo no compartido a público externo
+Project=Proyecto
+Projects=Proyectos
+Rights=Permisos
 # Week day
 Monday=Lunes
 Tuesday=Martes
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 4b6982c7e22..347fe5dea15 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Volumen de ventas (empresa) o Presupuesto (asociación o colect
 DefaultAmount=Importe por defecto cotización
 CanEditAmount=El visitante puede elegir/modificar el importe de su cotización
 MEMBER_NEWFORM_PAYONLINE=Ir a la página integrada de pago en línea
-ByProperties=Por características
-MembersStatisticsByProperties=Estadísticas de los miembros por características
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Esta pantalla presenta una estadística del número de miembros por naturaleza.
 MembersByRegion=Esta pantalla presenta una estadística del número de miembros por región
 VATToUseForSubscriptions=Tasa de IVA para las afiliaciones
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index f61a1ba2e7c..09da126d632 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=Fichero con las reglas de negocio
 LanguageFile=Archivo para el idioma
 ConfirmDeleteProperty=¿Estás seguro que quieres eliminar la propiedad <strong>%s</strong>? Esto cambiará código en la clase PHP pero también eliminará la columna de la definición de la tabla del objeto.
 NotNull=No NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Usada para 'buscar todo'
 DatabaseIndex=Indice de la base de datos
 FileAlreadyExists=Fichero %s ya existe
@@ -70,7 +71,7 @@ NoWidget=No hay widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index d6b09c77106..2a3d7cbc429 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -76,10 +76,10 @@ MaxSize=Tamaño máximo
 AttachANewFile=Adjuntar nuevo archivo/documento
 LinkedObject=Objeto adjuntado
 NbOfActiveNotifications=Número de notificaciones (nº de destinatarios)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailTest=__(Hello)__\nEste es un correo de prueba enviado a __EMAIL__.\nLas dos líneas están separadas por un retorno de carro.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__\nEste es un correo de <b> prueba</b> (la palabra prueba debe estar en negrita). <br> Las dos líneas están separadas por un retorno de carro. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí encontrará la factura __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNos gustaría advertirle que la factura __REF__ parece no estar pagada. Así que le enviamos de nuevo la factura en el archivo adjunto, como un recordatorio.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index b25a86859b5..686e4f166be 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. proyecto
 ProjectRef=Ref. proyecto
 ProjectId=Id proyecto
 ProjectLabel=Etiqueta proyecto
-Project=Proyecto
-Projects=Proyectos
 ProjectsArea=Área Proyectos
 ProjectStatus=Estado del proyecto
 SharedProject=Proyecto compartido
@@ -38,6 +36,7 @@ OpenedTasks=Tareas abiertas
 OpportunitiesStatusForOpenedProjects=Importe oportunidades de proyectos por estado
 OpportunitiesStatusForProjects=Importe oportunidades de proyectos por estado
 ShowProject=Ver proyecto
+ShowTask=Ver tarea
 SetProject=Definir proyecto
 NoProject=Ningún proyecto definido
 NbOfProjects=Nº de proyectos
@@ -77,6 +76,7 @@ Time=Tiempo
 ListOfTasks=Listado de tareas
 GoToListOfTimeConsumed=Ir al listado de tiempos consumidos
 GoToListOfTasks=Ir al listado de tareas
+GanttView=Gantt View
 ListProposalsAssociatedProject=Listado de presupuestos asociados al proyecto
 ListOrdersAssociatedProject=Listado de pedidos de clientes asociados al proyecto
 ListInvoicesAssociatedProject=Listado de facturas a clientes asociadas al proyecto
@@ -108,6 +108,7 @@ AlsoCloseAProject=Cerrar también el proyecto (mantener abierto si todavía nece
 ReOpenAProject=Reabrir proyecto
 ConfirmReOpenAProject=Está seguro de querer reabrir este proyecto?
 ProjectContact=Contactos proyecto
+TaskContact=Task contacts
 ActionsOnProject=Eventos del proyecto
 YouAreNotContactOfProject=Usted no es contacto de este proyecto privado
 UserIsNotContactOfProject=El usuario no es un contacto de este proyecto privado
@@ -115,7 +116,7 @@ DeleteATimeSpent=Eliminación de tiempo dedicado
 ConfirmDeleteATimeSpent=¿Está seguro de querer eliminar este tiempo dedicado?
 DoNotShowMyTasksOnly=Ver también tareas no asignadas a mí
 ShowMyTasksOnly=Ver solamente tareas asignadas a mí
-TaskRessourceLinks=Recursos
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Proyectos dedicados a este tercero
 NoTasks=Ninguna tarea para este proyecto
 LinkedToAnotherCompany=Enlazado a otra empresa
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index df6fa33840e..60f79c544bf 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -13,3 +13,5 @@ TJM=Tasa media por día
 CurrentSalary=Salario actual
 THMDescription=Este valor puede ser usado para calcular los costos de tiempo consumidos en un proyecto indicados por los usuarios si se utiliza el módulo proyectos
 TJMDescription=Este valor actualmente es informativo y no se utiliza para realizar cualquier tipo de cálculo
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index f410210bb15..752bb45da94 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movimientos
 ErrorWarehouseRefRequired=El nombre de referencia del almacén es obligatorio
 ListOfWarehouses=Listado de almacenes
 ListOfStockMovements=Listado de movimientos de stock
+MovementId=Movement ID
 StockMovementForId=ID movimiento %d
 ListMouvementStockProject=Listado de movimientos de stock asociados al proyecto
 StocksArea=Área almacenes
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=El nivel de stock debe ser suficiente para añadir e
 StockMustBeEnoughForOrder=El nivel de stock debe ser suficiente para añadir el producto/servicio al pedido (se realiza comprobación del stock real actual al agregar una línea en el pedido según las reglas del módulo stocks)
 StockMustBeEnoughForShipment= El nivel de stock debe ser suficiente para añadir el producto/servicio en el envío (se realiza comprobación del stock real actual al agregar una línea en el envío según las reglas del módulo stocks)
 MovementLabel=Etiqueta del movimiento
+DateMovement=Date of movement
 InventoryCode=Movimiento o código de inventario
 IsInPackage=Contenido en el paquete
 WarehouseAllowNegativeTransfer=El stock puede ser negativvo
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index b9ea948016b..6f850041f70 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Gasto
-ExpenseReports=Informes de gastos
 ShowExpenseReport=Ver informe de gastos
 Trips=Gastos
 TripsAndExpenses=Gastos
@@ -12,6 +10,8 @@ ListOfFees=Listado de honorarios
 TypeFees=Tipos de honorarios
 ShowTrip=Ver informe de gastos
 NewTrip=Nuevo gasto
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Empresa/institución visitada
 FeesKilometersOrAmout=Importe o kilómetros
 DeleteTrip=Eliminar gasto
@@ -71,6 +71,8 @@ EX_FUE_VP=Combustible
 EX_TOL_VP=Peaje
 EX_PAR_VP=Estacionamiento
 EX_CAM_VP=Mantenimiento y reparaciones
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Número de rango predeterminado
 
 ErrorDoubleDeclaration=Ha declarado otro gasto en un rango similar de fechas.
 AucuneLigne=No hay gastos declarados
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index dca29e17426..4ac419a23f7 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Eliminar sitio web
 ConfirmDeleteWebsite=¿Está seguro de querer eliminar este sitio web? Todas las páginas y contenido también sera eliminado
 WEBSITE_PAGENAME=Nombre/alias página
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL del fichero CSS externo
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Editar Estilo/CSS o cabecera HTML
 EditMenu=Editar menu
 EditMedias=Editar los medios
 EditPageMeta=Editar Meta
-Website=Sitio web
 AddWebsite=Añadir sitio web
 Webpage=Página web/Contenedor
 AddPage=Añadir página/contenedor
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL del Host Virtual servido por un servidor externo no
 NoPageYet=No hay páginas todavía
 SyntaxHelp=Ayuda en la sintaxis del código
 YouCanEditHtmlSourceckeditor=Puede editar código fuente HTML utilizando el botón "Origen" en el editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clonar página/contenedor
 CloneSite=Clonar sitio
+SiteAdded=Web site added
 ConfirmClonePage=Por favor ingrese el código/alias de la nueva página y si es una traducción de la página clonada.
 PageIsANewTranslation=¿La nueva página es una traducción de la página actual?
 LanguageMustNotBeSameThanClonedPage=Usted clona una página como una traducción. El idioma de la nueva página debe ser diferente al idioma de la página de origen.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=O crear una página vacía desde cero ...
 FetchAndCreate=Buscar y crear
 ExportSite=Exportar sitio
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index a3c6deacc1c..1aa42179f39 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -128,12 +128,16 @@ Module30Name=Facturas
 Module50Name=productos
 Module770Name=Reporte de gastos
 Module3200Desc=Active el registro de algunos eventos empresariales en un registro no reversible. Los eventos se archivan en tiempo real. El registro es una tabla de sucesos encadenados que se pueden leer y exportar. Este módulo puede ser obligatorio para algunos países.
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 DictionaryCanton=Estado/Provincia
 DictionaryAccountancyJournal=Diarios de contabilidad
 Upgrade=Actualizar
 CompanyName=Nombre
 LDAPFieldFirstName=Nombre(s)
 CacheByServerDesc=Por ejemplo, utilizando la directiva Apache "ExpiresByType image/gif A2592000"
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas de directiva: <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 WarningNoteModulePOSForFrenchLaw=Este módulo %s es compatible con las leyes francesas (Loi Finance 2016) porque el módulo Non Reversible Logs se activa automáticamente.
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 82e7384aa75..55ecd557733 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -260,6 +260,7 @@ Gender=Género
 ViewList=Vista de la lista
 Sincerely=Sinceramente
 DeleteLine=Borrar línea
+ExpenseReports=Reporte de gastos
 Monday=lunes
 Tuesday=martes
 Wednesday=miércoles
diff --git a/htdocs/langs/es_MX/trips.lang b/htdocs/langs/es_MX/trips.lang
index e7b2e160598..a0b452d1047 100644
--- a/htdocs/langs/es_MX/trips.lang
+++ b/htdocs/langs/es_MX/trips.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReports=Reporte de gastos
 Trips=Reporte de gastos
 ExpenseReportDateStart=Fecha de inicio
 ExpenseReportDateEnd=Fecha de finalización
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index 059de87f623..b733bb54fa0 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -3,3 +3,7 @@ VersionUnknown=Desconocido
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index befa730a33c..360f1e5239b 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -6,7 +6,6 @@ ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportar con cuenta global
 ACCOUNTING_EXPORT_LABEL=Etiqueta de exportación
 ACCOUNTING_EXPORT_AMOUNT=Monto de exportación
 ACCOUNTING_EXPORT_DEVISE=Moneda de exportación
-Selectformat=Seleccione el formato del fichero
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo del nombre del fichero
 ConfigAccountingExpert=Configuración del módulo experto en contabilidad
 Journaux=Revistas
@@ -20,6 +19,7 @@ SuppliersVentilation=Factura de proveedores vinculados
 CreateMvts=Crear nueva transacción
 UpdateMvts=Modificación de una transacción
 WriteBookKeeping=Periodizar transacción en Libro Mayor
+CAHTF=Total compras de proveedor antes de impuestos
 InvoiceLines=Líneas de facturas para enlazar
 InvoiceLinesDone=Líneas de facturas vinculadas
 IntoAccount=Vincular la línea con la cuenta de contabilidad
@@ -41,4 +41,13 @@ ACCOUNTING_PURCHASE_JOURNAL=Diario de Compra
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario diverso
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de Gastos Diario
 ACCOUNTING_SOCIAL_JOURNAL=Diario Social
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta contable de transferencia
+ACCOUNTING_ACCOUNT_SUSPENSE=Cuenta contable de espera
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta de contabilidad por defecto para los productos comprados (Usados sin no están en la hoja de producto)
+Sens=Significado
+Codejournal=Periódico
+DelBookKeeping=Eliminar registro del libro mayor
+FinanceJournal=Periodo Financiero
+TotalMarge=Margen total de ventas
 OptionsDeactivatedForThisExportModel=Para este modelo de exportación, las opciones están desactivadas
+Modelcsv_CEGID=Exportar hacia CEGID Experto contable
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index a0de2107bec..514ce668f58 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -2,6 +2,8 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
 Permission93=Eliminar impuestos e IGV
@@ -12,3 +14,5 @@ UnitPriceOfProduct=Precio unitario sin IGV de un producto
 OptionVatMode=Opción de carga de IGV
 OptionVatDefaultDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_PE/bills.lang b/htdocs/langs/es_PE/bills.lang
index adca33be66b..78061ca2216 100644
--- a/htdocs/langs/es_PE/bills.lang
+++ b/htdocs/langs/es_PE/bills.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - bills
+BillShortStatusClosedUnpaid=Cerrado
 ErrorVATIntraNotConfigured=Número de IGV intracomunitario aún no configurado
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar <b>(%s %s)</b> es un descuento acordado después de la factura. Acepto perder el IGV de este descuento
 AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IGV)
diff --git a/htdocs/langs/es_PE/companies.lang b/htdocs/langs/es_PE/companies.lang
index 539eedb232e..29e8843fc1e 100644
--- a/htdocs/langs/es_PE/companies.lang
+++ b/htdocs/langs/es_PE/companies.lang
@@ -3,3 +3,4 @@ VATIsUsed=Sujeto a IGV
 VATIsNotUsed=No sujeto a IGV
 VATIntra=RUC
 VATIntraShort=RUC
+InActivity=Abrir
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index 6398e2fbb24..8e60a04abdc 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -25,3 +25,5 @@ HT=Sin IGV
 TTC=IGV incluido
 VAT=IGV
 VATRate=Tasa IGV
+Drafts=Borrador
+Opened=Abrir
diff --git a/htdocs/langs/es_PE/propal.lang b/htdocs/langs/es_PE/propal.lang
index 919d94b3e91..dc382b08a75 100644
--- a/htdocs/langs/es_PE/propal.lang
+++ b/htdocs/langs/es_PE/propal.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - propal
 AmountOfProposalsByMonthHT=Importe por mes (Sin IGV)
+PropalsOpened=Abrir
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index 1c53b65c99c..dcc95ac6ab5 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -2,3 +2,7 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 6079989953b..8c9b455cd2a 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -13,3 +13,5 @@ SupplierProposalNumberingModules=Modelos de numeración de solicitud de precios
 SupplierProposalPDFModules=Modelos de documentos de solicitud de precios a proveedores
 FreeLegalTextOnSupplierProposal=Texto libre en solicitudes de precios a proveedores
 WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
+AGENDA_REMINDER_EMAIL=Enable event reminder by emails (defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index 749498bb3d6..e7a0feae542 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -31,6 +31,7 @@ FindBug=Señalar un bug
 LinkToOrder=Enlazar a un pedido
 Progress=Progresión
 Export=Exportación
+ExpenseReports=Gastos
 SearchIntoSupplierProposals=Presupuestos de proveedores
 SearchIntoExpenseReports=Gastos
 SearchIntoLeaves=Días libres
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 385d915114a..57ca0e540c1 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Tuvasta automaatselt (brauseri keel)
 FeatureDisabledInDemo=Demoversioonis blokeeritud funktsionaalsus
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Õigused
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Näidatakse ainult elemente <a href="%s">sisse lülitatud moodulitest</a>.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Võimaldab hallata mitut ettevõtet
 Module6000Name=Töövoog
 Module6000Desc=Töövoo haldamine
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Puhkusetaotluste haldamine
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Paroolide genereerimise või valideerimise reegel
 DisableForgetPasswordLinkOnLogonPage=Ära näita sisselogimise lehel "Unustasin parooli" linki
 UsersSetup=Kasutajate mooduli seadistamine
 UserMailRequired=Uue kasutaja loomiseks on vajalik e-posti aadress
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/et_EE/commercial.lang b/htdocs/langs/et_EE/commercial.lang
index 4aef02088c6..2d0ff995586 100644
--- a/htdocs/langs/et_EE/commercial.lang
+++ b/htdocs/langs/et_EE/commercial.lang
@@ -70,3 +70,9 @@ Stats=Müügistatistika
 StatusProsp=Huviliste staatus
 DraftPropals=Mustandi staatuses olevad pakkumised
 NoLimit=Piirangut pole
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index 7ac414772f6..3e92f4d40a1 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index a0c812f4865..7bf2754271f 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unikaalseid kontakte/aadresse
 MailNoChangePossible=Kinnitatud e-postituse saajaid ei ole võimalik muuta
 SearchAMailing=Otsi postitust
 SendMailing=Saada e-postitus
-SendMail=Saada e-kiri
 SentBy=Saatis
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Siiski saab neid saata online-režiimis, kui lisate parameetri MAILING_LIMIT_SENDBYWEB maksimaalse kirjade arvuga, mida sessiooni kohta saata. Selleks mine menüüsse Kodu->Seadistamine->Muu.
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index bd2d0439d7c..d22be7e2dac 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Heakskiitmise kuupäev (teine nõuseolek)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=aasta
 DurationMonth=kuu
 DurationWeek=nädal
@@ -608,6 +610,7 @@ SendByMail=Saada e-postiga
 MailSentBy=E-posti saatis
 TextUsedInTheMessageBody=E-kirja sisu
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Saada e-kiri
 EMail=E-mail
 NoEMail=E-posti aadress puudub
 Email=E-post
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Tegevused
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projektid
+Rights=Õigused
 # Week day
 Monday=Esmaspäev
 Tuesday=Teisipäev
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 2ea8353b541..4126d517484 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Käive (ettevõttel) või eelarve maht (ühendusel)
 DefaultAmount=Vaikimisi liikmemaks
 CanEditAmount=Külastaja saab oma liikmemaksu valida/summat muuta
 MEMBER_NEWFORM_PAYONLINE=Hüppa integreeritud online-makse lehele
-ByProperties=Karakteristikute alusel
-MembersStatisticsByProperties=Liikmete statistika karakteristikute alusel
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Liikmemaksude jaoks kasutatav KM määr
diff --git a/htdocs/langs/et_EE/modulebuilder.lang b/htdocs/langs/et_EE/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/et_EE/modulebuilder.lang
+++ b/htdocs/langs/et_EE/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 5956fdf2f55..fbea72a9704 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. projekt
 ProjectRef=Project ref.
 ProjectId=Projekti ID
 ProjectLabel=Project label
-Project=Projekt
-Projects=Projektid
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Kõik
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Kuva projekt
+ShowTask=Näita ülesannet
 SetProject=Määra projekt
 NoProject=Ühtki projekti pole määratletud või ei oma ühtki projekt
 NbOfProjects=Projekte
@@ -77,6 +76,7 @@ Time=Aeg
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Antud projektiga seotud pakkumised
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Ava projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekti kontaktid
+TaskContact=Task contacts
 ActionsOnProject=Projekti tegevused
 YouAreNotContactOfProject=Sa ei ole antud privaatse projekti kontakt
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Kustuta kulutatud aeg
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressursid
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Selle kolmanda isikuga seotud projektid
 NoTasks=Selle projektiga ei ole seotud ühtki ülesannet
 LinkedToAnotherCompany=Seotud muu kolmanda isikuga
diff --git a/htdocs/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang
index 0536dd64079..7588458aa3b 100644
--- a/htdocs/langs/et_EE/salaries.lang
+++ b/htdocs/langs/et_EE/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index b6554dcae49..a5d61a633e4 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -22,6 +22,7 @@ Movements=Liikumised
 ErrorWarehouseRefRequired=Lao viide on nõutud
 ListOfWarehouses=Ladude nimekiri
 ListOfStockMovements=Laojääkide nimekiri
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang
index 90c79b953ad..d54a03ccd95 100644
--- a/htdocs/langs/et_EE/trips.lang
+++ b/htdocs/langs/et_EE/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List tasude
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Summa või kilomeetrites
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index 177ee1f71c1..79d85a6644b 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index dc4e3b97b96..d59eea32b6f 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Berez antzeman (nabigatzailean hizkuntza)
 FeatureDisabledInDemo=Demo-an ezgaitutako aukera
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Baimenak
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang
index 938c1d94da1..3d837a951e0 100644
--- a/htdocs/langs/eu_ES/commercial.lang
+++ b/htdocs/langs/eu_ES/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Proiektuaren egoera
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/eu_ES/holiday.lang b/htdocs/langs/eu_ES/holiday.lang
index 244b6e0a323..c373d3154d2 100644
--- a/htdocs/langs/eu_ES/holiday.lang
+++ b/htdocs/langs/eu_ES/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 5ab7c04e930..4e508c46af5 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=e-posta bidali
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index da5919a5aed..a5aa069e682 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=e-posta bidali
 EMail=E-mail
 NoEMail=No email
 Email=E-posta
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Gertaerak
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Proiektuak
+Rights=Baimenak
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index c6c125fe89d..53b15c38d77 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/eu_ES/modulebuilder.lang b/htdocs/langs/eu_ES/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/eu_ES/modulebuilder.lang
+++ b/htdocs/langs/eu_ES/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 7023aba5a35..fb3e189e8a6 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Proiektuak
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
index a1cfebf53c4..9d49b001ef9 100644
--- a/htdocs/langs/eu_ES/salaries.lang
+++ b/htdocs/langs/eu_ES/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index afe24bace71..7f2194b523e 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang
index 0791e1df8e5..c90e92661df 100644
--- a/htdocs/langs/eu_ES/trips.lang
+++ b/htdocs/langs/eu_ES/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index c077858d2c9..c628ffecd21 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 9a967a7aec4..c3c3fd113d7 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=آشکارسازی خودکار (زبان مرورگر)
 FeatureDisabledInDemo=از ویژگی های غیر فعال در نسخه ی نمایشی
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=مجوز
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=تنها عناصر از <a href="%s">ماژول های فعال</a> نمایش داده می شود.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=اجازه می دهد تا به شما برای مدیریت ش
 Module6000Name=گردش کار
 Module6000Desc=مدیریت گردش کار
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=حکومت برای تولید کلمه عبور پی
 DisableForgetPasswordLinkOnLogonPage=آیا لینک را نشان نمی دهد "فراموش کردن رمز عبور» در صفحه ورود
 UsersSetup=راه اندازی ماژول کاربران
 UserMailRequired=ایمیل مورد نیاز برای ایجاد یک کاربر جدید
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/fa_IR/commercial.lang b/htdocs/langs/fa_IR/commercial.lang
index 334dcca68ff..86458272fc0 100644
--- a/htdocs/langs/fa_IR/commercial.lang
+++ b/htdocs/langs/fa_IR/commercial.lang
@@ -70,3 +70,9 @@ Stats=آمار فروش
 StatusProsp=وضعیت چشم انداز
 DraftPropals=طرح تجاری پیش نویس
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang
index ab8d92aad13..cdf39db949a 100644
--- a/htdocs/langs/fa_IR/holiday.lang
+++ b/htdocs/langs/fa_IR/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 6dab1997452..e086510972b 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=تماس با ما منحصر به فرد / آدرس
 MailNoChangePossible=دریافت کنندگان برای ایمیل معتبر نمی تواند تغییر کند
 SearchAMailing=جستجو های پستی
 SendMailing=ارسال ایمیل
-SendMail=ارسال ایمیل
 SentBy=ارسال شده توسط
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=با این حال شما می توانید آنها را به صورت آنلاین ارسال شده توسط اضافه کردن MAILING_LIMIT_SENDBYWEB پارامتر با مقدار حداکثر تعداد ایمیل های شما می خواهید به جلسه ارسال کنید. برای این کار، در خانه به - راه اندازی - سایر.
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index a93995ad219..2f23271a99f 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=سال
 DurationMonth=ماه
 DurationWeek=هفته
@@ -608,6 +610,7 @@ SendByMail=ارسال با ایمیل
 MailSentBy=ایمیل های فرستاده شده توسط
 TextUsedInTheMessageBody=بدن ایمیل
 SendAcknowledgementByMail=Send confirmation email
+SendMail=ارسال ایمیل
 EMail=E-mail
 NoEMail=بدون پست الکترونیک
 Email=پست الکترونیک
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=رویدادها
 EMailTemplates=الگوهای ایمیل
 FileNotShared=File not shared to exernal public
+Project=پروژه
+Projects=پروژه ها
+Rights=مجوز
 # Week day
 Monday=دوشنبه
 Tuesday=سهشنبه
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index 3a736f480e0..4790dd1444e 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=گردش مالی (برای یک شرکت) و یا بودجه (
 DefaultAmount=مقدار پیش فرض از اشتراک
 CanEditAmount=بازدید کنندگان می توانند / ویرایش میزان اشتراک خود را انتخاب کنید
 MEMBER_NEWFORM_PAYONLINE=پرش در یکپارچه صفحه پرداخت آنلاین
-ByProperties=با ویژگی
-MembersStatisticsByProperties=آمار کاربران توسط ویژگی
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=نرخ مالیات بر ارزش افزوده برای استفاده از اشتراک ها
diff --git a/htdocs/langs/fa_IR/modulebuilder.lang b/htdocs/langs/fa_IR/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/fa_IR/modulebuilder.lang
+++ b/htdocs/langs/fa_IR/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 9461e72881d..615a2c1b160 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -3,8 +3,6 @@ RefProject=کد عکس. پروژه
 ProjectRef=Project ref.
 ProjectId=پروژه کد
 ProjectLabel=Project label
-Project=پروژه
-Projects=پروژه ها
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=هر کسی
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=نمایش پروژه
+ShowTask=نمایش کار
 SetProject=تنظیم پروژه
 NoProject=هیچ پروژه تعریف شده و یا متعلق به
 NbOfProjects=Nb در پروژه
@@ -77,6 +76,7 @@ Time=زمان
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=فهرست طرح تجاری مرتبط با پروژه
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=پروژه گسترش
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=تماس با ما پروژه
+TaskContact=Task contacts
 ActionsOnProject=رویدادها در پروژه
 YouAreNotContactOfProject=شما یک تماس از این پروژه خصوصی نیست
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=زمان صرف شده حذف
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=منابع
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=پروژه ها اختصاص داده شده به این شخص ثالث
 NoTasks=بدون وظایف برای این پروژه
 LinkedToAnotherCompany=لینک به دیگر شخص ثالث
diff --git a/htdocs/langs/fa_IR/salaries.lang b/htdocs/langs/fa_IR/salaries.lang
index 6641ba267bd..a1d8b9a91cb 100644
--- a/htdocs/langs/fa_IR/salaries.lang
+++ b/htdocs/langs/fa_IR/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index a50506a3159..e6f631af75f 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -22,6 +22,7 @@ Movements=جنبش
 ErrorWarehouseRefRequired=نام انبار مرجع مورد نیاز است
 ListOfWarehouses=لیست انبار
 ListOfStockMovements=فهرست جنبش های سهام
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang
index 1528cc035ed..b622c9a7dde 100644
--- a/htdocs/langs/fa_IR/trips.lang
+++ b/htdocs/langs/fa_IR/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=فهرست هزینه ها
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=مقدار و یا کیلومتر
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index edf781cd4f6..d6e732a2141 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index d34746433ba..d5fdf63e2fd 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Automaattisesti (selaimen kieli)
 FeatureDisabledInDemo=Feature vammaisten demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Oikeudet
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Avulla voit hallita useita yrityksiä
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Työjärjestyksen tuottaa ehdotti salasanoja
 DisableForgetPasswordLinkOnLogonPage=Älä näytä linkkiä "Unohda salasana" on kirjautumissivulla
 UsersSetup=Käyttäjät moduuli setup
 UserMailRequired=Sähköposti Vaaditaan Luo uusi käyttäjä
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/fi_FI/commercial.lang b/htdocs/langs/fi_FI/commercial.lang
index b99d073fb90..01e1252558c 100644
--- a/htdocs/langs/fi_FI/commercial.lang
+++ b/htdocs/langs/fi_FI/commercial.lang
@@ -70,3 +70,9 @@ Stats=Myyntitilastot
 StatusProsp=Mahdollisuuden tila
 DraftPropals=Tarjousluonnos
 NoLimit=Rajoittamaton
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
index 0c3ab97a166..c421c02c9be 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index d7eccfc2b5b..02198779186 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Ainutlaatuinen yhteyksiä yritysten
 MailNoChangePossible=Vastaanottajat validoitava sähköpostia ei voi muuttaa
 SearchAMailing=Haku mailing
 SendMailing=Lähetä sähköpostia
-SendMail=Lähetä sähköpostia
 SentBy=Lähettänyt
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Voit kuitenkin lähettää ne online lisäämällä parametri MAILING_LIMIT_SENDBYWEB kanssa arvo max määrä sähköpostit haluat lähettää istunnossa.
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index b9487c4f8c8..b6d1fa6be2d 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Hyväksytään päivämäärä (toinen hyväksyntä)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=vuosi
 DurationMonth=kuukausi
 DurationWeek=viikko
@@ -608,6 +610,7 @@ SendByMail=Lähetä sähköpostilla
 MailSentBy=Sähköpostin lähetti
 TextUsedInTheMessageBody=Sähköpostiviesti
 SendAcknowledgementByMail=Lähetä vahvistussähköposti
+SendMail=Lähetä sähköpostia
 EMail=Sähköposti
 NoEMail=Ei sähköpostia
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Kuluraportit
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Tapahtumat
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Hanke
+Projects=Projektit
+Rights=Oikeudet
 # Week day
 Monday=Maanantai
 Tuesday=Tiistai
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 610a4fcf4d4..8e2299b0c15 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Liikevaihto (yritykselle) tai budjetti (ja säätiö)
 DefaultAmount=Oletus määrä tilauksen
 CanEditAmount=Matkailija voi valita / muokata määrä merkitsemästään
 MEMBER_NEWFORM_PAYONLINE=Hyppää integroitu verkossa maksusivulla
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/fi_FI/modulebuilder.lang b/htdocs/langs/fi_FI/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/fi_FI/modulebuilder.lang
+++ b/htdocs/langs/fi_FI/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 9bbd2b1de34..21a5a53b4c1 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Hanke
-Projects=Projektit
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Yhteiset hanke
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Näytä hankkeen
+ShowTask=Näytä tehtävä
 SetProject=Aseta hankkeen
 NoProject=Ei hanke määritellään
 NbOfProjects=Nb hankkeiden
@@ -77,6 +76,7 @@ Time=Aika
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Luettelot kaupallisen ehdotuksia hankkeeseen liittyvät
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Avaa projekti
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Hankkeen yhteystiedot
+TaskContact=Task contacts
 ActionsOnProject=Toimien hanketta
 YouAreNotContactOfProject=Et ole kosketuksissa tämän yksityisen hankkeen
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Poista käytetty aika
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resurssit
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Hankkeet omistettu tälle kolmannelle
 NoTasks=Ei tehtävät hankkeen
 LinkedToAnotherCompany=Liittyy muihin kolmannen osapuolen
diff --git a/htdocs/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang
index 68cd52ce9ba..dfb2f671b12 100644
--- a/htdocs/langs/fi_FI/salaries.lang
+++ b/htdocs/langs/fi_FI/salaries.lang
@@ -13,3 +13,5 @@ TJM=Keskimääräinen päiväpalkka
 CurrentSalary=Nykyinen palkka
 THMDescription=Jos projektimoduli on käytössä, tätä arvoa voi käyttää projektin aikakustannuksen laskemiseen käyttäjän syöttämien tuntien perusteella
 TJMDescription=Tätä arvoa ei toistaiseksi käytetä laskentaan, se on olemassa vain tiedoksi
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 55ac34f73de..3dd1c57343a 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -22,6 +22,7 @@ Movements=Liikkeet
 ErrorWarehouseRefRequired=Warehouse viite nimi tarvitaan
 ListOfWarehouses=Luettelo varastoissa
 ListOfStockMovements=Luettelo varastojen muutokset
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang
index 65c752fd441..f3c1bd245a1 100644
--- a/htdocs/langs/fi_FI/trips.lang
+++ b/htdocs/langs/fi_FI/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Kuluraportit
 ShowExpenseReport=Show expense report
 Trips=Kuluraportit
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Luettelo palkkiot
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Määrä tai kilometreinä
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index 65e61435e6b..935b5c96642 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index a994014f061..059fcf9b8e8 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -24,6 +24,9 @@ AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module20Name=Propales
 Module30Name=Factures
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
 DictionaryPaymentConditions=Conditions de paiement
 SuppliersPayment=Paiements fournisseurs
 Target=Objectif
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 0a942f85061..725dcaa2eb6 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -85,6 +85,7 @@ Boolean=Boolean (une case à cocher)
 ExtrafieldSeparator=Séparateur (pas un champ)
 ExtrafieldRadio=Boutons radio (uniquement sur le choix)
 ExtrafieldCheckBoxFromList=Les cases à cocher du tableau
+ExtrafieldLink=Lier à un objet
 ComputedFormulaDesc=Vous pouvez entrer ici une formule utilisant d'autres propriétés de l'objet ou tout codage PHP pour obtenir une valeur calculée dynamique. Vous pouvez utiliser toutes les formules compatibles PHP, y compris le "?" L'opérateur de condition et l'objet global suivant: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </ strong>. <br> <strong> AVERTISSEMENT </ strong>: Seules certaines propriétés de $ L'objet peut être disponible. Si vous avez besoin de propriétés non chargées, récupérez-vous l'objet dans votre formule comme dans le deuxième exemple. L'utilisation d'un champ calculé signifie que vous ne pouvez pas entrer de valeur d'interface. De plus, s'il existe une erreur de syntaxe, la formule ne peut renvoyer rien. <br> <br> Exemple de formule: $ $ object-> id <10? Round ($ object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2) <br> <br> Exemple de recharger l'objet <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetch ($ obj-> id? $ Obj-> id: ($ obj-> rowid? $ Obj-> Rowid: $ object-> id))> 0))? $ Reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Autre exemple de formule pour forcer la charge de l'objet et son objet parent: <br> (($ reloadedobj = New Task ($ db)) && ($ reloadedobj-> fetch ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($ secondloadedobj-> fetch ($ reloadedobj-> fk_project )> 0))? $ Secondloadedobj-> ref: 'Projet parent introuvable'
 ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Exemple : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération de PDF
@@ -139,7 +140,6 @@ Module3200Name=Grumes non réversibles
 Module3200Desc=Activez le journal de certains événements commerciaux dans un journal non réversible. Les événements sont archivés en temps réel. Le journal est un tableau de l'événement enchaîné qui peut ensuite être lu et exporté. Ce module peut être obligatoire pour certains pays.
 Module4000Name=Gestion des ressources humaines
 Module10000Name=Sites Internet
-Module10000Desc=Créez des sites Web publics avec un éditeur WYSIWG. Installez simplement votre serveur Web pour pointer vers le répertoire dédié pour l'avoir en ligne sur Internet.
 Module20000Name=Gestion des demandes de congès
 Module20000Desc=Déclaration et suivi des congès des employés
 Module39000Name=Lot/Série du produit
@@ -229,7 +229,6 @@ TotalPriceAfterRounding=Prix total (no tax/TPS/TVH/tx incl.) après arrondis
 BackupDesc2=Enregistrer le contenu du répertoire de documents (<b>%s</b>) qui contient tous les fichiers téléchargés et générés ( Donc, il inclut tous les fichiers de sauvegarde générés à l'étape 1).
 TranslationKeySearch=Rechercher une clé ou une chaîne de traduction
 TranslationOverwriteKey=Ecraser une chaîne de traduction
-TranslationDesc=Comment définir la langue de l'application affichée: <br> * Systemwide: menu <strong> Accueil - Configuration - Affichage </ strong> <br> * Par utilisateur: <strong> Affichage de l'utilisateur </ strong> onglet de la carte utilisateur (cliquez sur Nom d'utilisateur en haut de l'écran).
 TranslationOverwriteDesc=Vous pouvez également remplacer les chaînes en remplissant le tableau suivant. Choisissez votre langue dans le menu déroulant "%s", insérez la chaîne de traduction dans "%s" et votre nouvelle traduction dans "%s"
 TranslationString=Chaîne de traduction
 WarningAtLeastKeyOrTranslationRequired=Un critère de recherche est requis au moins pour une clé ou une chaîne de traduction
@@ -289,6 +288,7 @@ OptionVatDebitOptionDesc=TPS/TVH sur débit, l'exigibilité de la TPS/TVH est:<b
 SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilité par défaut de la TPS/TVH pour l'option choisie:
 YourCompanyDoesNotUseVAT=Votre entreprise a été définie pour ne pas utiliser la TVA (Home - Setup - Company / Organization), donc il n'y a pas de TVA pour configurer.
 AGENDA_USE_EVENT_TYPE_DEFAULT=Réglez automatiquement cette valeur par défaut pour le type d'événement dans en événement de lors de la création »
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue d'agenda
 ClickToDialUrlDesc=Url appelle quand un clic sur le picto du téléphone est terminé. Dans l'URL, vous pouvez utiliser des tags sur <b> __ PHONETO __ </ b> qui sera remplacé par le numéro de téléphone de la personne à appeler <b> __ PHONEFROM __ </ b> qui sera remplacé par le numéro de téléphone de l'appel Personne (votre) <br> <b> __ LOGIN __ </ b> qui sera remplacé par login clicktodial (défini sur la carte utilisateur) <br> <b> __ PASS __ </ b> qui sera remplacé par le mot de passe clicktodial (défini sur l'utilisateur carte).
 ClickToDialDesc=Ce module permet de faire des numéros de téléphone cliquable . Un clic sur cette icône fera appel à rendre votre téléphone pour appeler le numéro de téléphone . Cela peut être utilisé pour appeler un système de Dolibarr du centre d'appels qui peut appeler le numéro de téléphone sur un système SIP par exemple.
diff --git a/htdocs/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
index eea01627042..9e54c776bf8 100644
--- a/htdocs/langs/fr_CA/mails.lang
+++ b/htdocs/langs/fr_CA/mails.lang
@@ -74,7 +74,6 @@ NbOfCompaniesContacts=Contacts / adresses uniques
 MailNoChangePossible=Les destinataires pour les courriers électroniques validés ne peuvent pas être modifiés
 SearchAMailing=Chercher l'envoi postal
 SendMailing=Envoyer un courrier électronique
-SendMail=Envoyer un courrier électronique
 SentBy=Envoyée par
 MailingNeedCommand=L'envoi d'un courrier électronique peut être effectué à partir de la ligne de commande. Demandez à votre administrateur du serveur de lancer la commande suivante pour envoyer le courrier électronique à tous les destinataires:
 MailingNeedCommand2=Vous pouvez cependant les envoyer en ligne en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails que vous souhaitez envoyer par session. Pour cela, passez à la page d'accueil - Configuration - Autre.
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 02c64c14c02..343df729008 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -143,10 +143,12 @@ Fiscalyear=Année fiscale
 SetMultiCurrencyCode=Définir la devise
 BulkActions=Actions en vrac
 ClickToShowHelp=Cliquez pour afficher l'aide sur les outils
+ExpenseReports=Note de frais
 HR=HEURE
 HRAndBank=RH et Banque
 TitleSetToDraft=Retourner au brouillon
 ConfirmSetToDraft=Êtes-vous sûr de vouloir revenir à l'état du projet?
+Rights=Droits
 SetRef=Ref.
 Select2ResultFoundUseArrows=Certains résultats ont été trouvés. Utilisez les flèches pour sélectionner.
 Select2NotFound=Aucun résultat trouvé
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index 3bb8d7d8ddd..26e7135f0df 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -144,7 +144,6 @@ TurnoverOrBudget=Chiffre d'affaires (pour une entreprise) ou Budget (pour une fo
 DefaultAmount=Montant d'abonnement par défaut
 CanEditAmount=Le visiteur peut choisir / modifier le montant de son abonnement
 MEMBER_NEWFORM_PAYONLINE=Aller sur la page de paiement en ligne intégrée
-MembersStatisticsByProperties=Statistiques des membres par caractéristiques
 MembersByNature=Cet écran vous montre des statistiques sur les membres par nature.
 MembersByRegion=Cet écran vous montre des statistiques sur les membres par région.
 VATToUseForSubscriptions=Taux de TVA à utiliser pour les abonnements
diff --git a/htdocs/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
index 09396c04263..344334657f7 100644
--- a/htdocs/langs/fr_CA/other.lang
+++ b/htdocs/langs/fr_CA/other.lang
@@ -27,7 +27,6 @@ Notify_WITHDRAW_TRANSMIT=Retrait de la transmission
 Notify_WITHDRAW_CREDIT=Retrait de crédit
 Notify_WITHDRAW_EMIT=Effectuer le retrait
 Notify_COMPANY_SENTBYMAIL=Les envois envoyés par une carte tierce
-Notify_BILL_VALIDATE=Facture client validée
 Notify_BILL_UNVALIDATE=Facture du client non valide
 Notify_BILL_PAYED=Facture du client payée
 Notify_BILL_CANCEL=Facture du client annulée
diff --git a/htdocs/langs/fr_CA/trips.lang b/htdocs/langs/fr_CA/trips.lang
index 5c04b8ea966..343c597405d 100644
--- a/htdocs/langs/fr_CA/trips.lang
+++ b/htdocs/langs/fr_CA/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Rapport de dépenses
-ExpenseReports=Note de frais
 ShowExpenseReport=Afficher le rapport de dépenses
 TripsAndExpenses=Rapports sur les dépenses
 TripsAndExpensesStatistics=Statistiques des rapports de dépenses
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index e3fe6c0f745..152c5afe46d 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -7,7 +7,6 @@ WEBSITE_CSS_URL=URL du fichier CSS externe
 MediaFiles=Médiathèque
 EditMenu=Menu Edition
 EditPageMeta=Modifier Meta
-Website=Site Internet
 PreviewOfSiteNotYetAvailable=Aperçu de votre site web <strong>%s</strong> n'est pas encore disponible. Vous devez d'abord ajouter une page.
 ViewSiteInNewTab=Afficher le site dans un nouvel onglet
 ViewPageInNewTab=Afficher la page dans un nouvel onglet
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index 1c53b65c99c..da12bcec01b 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -2,3 +2,6 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+Module50000Desc=Module to offer an online payment page by credit card with PayBox
+Module50200Desc=Module to offer an online payment page by credit card with Paypal
+AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question)
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 35d05b7f296..961a4cdc36c 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -91,7 +91,7 @@ SuppliersVentilation=Liaison factures fournisseur
 ExpenseReportsVentilation=Liaison notes de frais
 CreateMvts=Créer nouvelle transaction
 UpdateMvts=Modification d'une transaction
-ValidTransaction=Valider la traduction
+ValidTransaction=Valider la transaction
 WriteBookKeeping=Inscrire les transactions dans le grand livre
 Bookkeeping=Grand livre
 AccountBalance=Balance des comptes
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 290301307ce..242fd090685 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -66,8 +66,8 @@ ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0
 DisableJavascript=Désactive les fonctions Javascript et Ajax (Recommandé pour les personnes aveugles ou navigateurs text).
 UseSearchToSelectCompanyTooltip=Si vous avez un nombre important de tiers (>100 000), vous pourrez améliorer les performances en positionnant la constante COMPANY_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
 UseSearchToSelectContactTooltip=Si vous avez un nombre important de contacts (>100 000), vous pourrez améliorer les performances en positionnant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
-DelaiedFullListToSelectCompany=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste déroulante des tiers (Cela peut augmenter les performances si vous avez un grand nombre de contacts)
-DelaiedFullListToSelectContact=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste déroulante des contacts/adresses (Cela peut augmenter les performances si vous avez un grand nombre de contacts)
+DelaiedFullListToSelectCompany=Attendre que vous ayez appuyé sur une touche avant de charger le contenu de la liste déroulante des tiers (Cela peut augmenter les performances si vous avez un grand nombre de contacts)
+DelaiedFullListToSelectContact=Attendre que vous ayez appuyé sur une touche avant de charger le contenu de la liste déroulante des contacts/adresses (Cela peut augmenter les performances si vous avez un grand nombre de contacts)
 NumberOfKeyToSearch=Nb carac. déclenchant recherche : %s
 NotAvailableWhenAjaxDisabled=Non disponible quand Ajax est désactivé
 AllowToSelectProjectFromOtherCompany=Sur les éléments d'un tiers, autorise la sélection d'un projet lié à un autre tiers
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignorer les erreurs de doublons (INSERT IGNORE)
 AutoDetectLang=Détection automatique (navigateur)
 FeatureDisabledInDemo=Fonction désactivée dans la démo
 FeatureAvailableOnlyOnStable=Fonction disponible uniquement sur les versions officielles stables
-Rights=Permissions
 BoxesDesc=Les widgets sont des composants montrant des informations que vous pouvez ajouter à vos pages pour les personnaliser. Vous pouvez choisir de les afficher ou non en sélectionnant la page cible et en cliquant sur "Activer" ou "Désactiver".
 OnlyActiveElementsAreShown=Seuls les éléments en rapport avec un <a href="%s">module actif</a> sont présentés.
 ModulesDesc=Les modules Dolibarr définissent quelle application / fonctionnalité est activée dans le logiciel. Certaines applications / modules nécessitent des autorisations que vous devez accorder aux utilisateurs, après l'avoir activé. Cliquez sur le bouton activé / désactivé pour activer un module / application.
@@ -260,17 +259,17 @@ Content=Contenu
 NoticePeriod=Délai de prévenance
 NewByMonth=Mois suivant
 Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
+EMailsSetup=Configuration Emails
+EMailsDesc=Cette page permet de remplacer les paramètres PHP en rapport avec l'envoi d'emails. Dans la plupart des cas, sur des OS comme Unix/Linux, les paramètres PHP sont déjà corrects et cette page est inutile.
 EmailSenderProfiles=Emails sender profiles
 MAIN_MAIL_SMTP_PORT=Port du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_EMAIL_FROM=Adresse email de l'émetteur pour l'envoi d'emails automatiques (Par défaut dans php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Adresse email utilisée pour les retours d'erreurs des emails envoyés
 MAIN_MAIL_AUTOCOPY_TO= Envoyer systématiquement une copie cachée des emails envoyés à
-MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_DISABLE_ALL_MAILS=Désactiver globalement tout envoi d'emails (pour mode test ou démos)
 MAIN_MAIL_SENDMODE=Méthode d'envoi des emails
 MAIN_MAIL_SMTPS_ID=Identifiant d'authentification SMTP si authentification SMTP requise
 MAIN_MAIL_SMTPS_PW=Mot de passe d'authentification SMTP si authentification SMTP requise
@@ -314,12 +313,12 @@ SetupIsReadyForUse=L"installation du module est terminée. Il est cependant néc
 NotExistsDirect=Le dossier racine alternatif n'est pas défini.<br>
 InfDirAlt=Depuis les versions 3, il est possible de définir un dossier racine alternatif. Cela permet d'installer modules et thèmes additionnels dans un répertoire dédié.<br>Créer un dossier racine alternatif à Dolibarr (ex : custom).<br>
 InfDirExample=<br>Ensuite, déclarez le dans le fichier <strong>conf.php</strong><br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Si ces lignes sont commentées avec un symbole "#" ou "//", activer les en supprimant le caractère "#" ou "//".
-YouCanSubmitFile=Envoyer ici la fichier zip du module externe :
+YouCanSubmitFile=Pour cette étape, vous pouvez soumettre votre fichier package ici :
 CurrentVersion=Version actuelle de Dolibarr
 CallUpdatePage=Aller à la page de mise à jour de la structure et des données de la base : %s.
 LastStableVersion=Dernière version stable disponible
 LastActivationDate=Date de dernière activation
-LastActivationAuthor=Dernier auteur de l'activation
+LastActivationAuthor=Auteur de la dernière activation
 LastActivationIP=Dernière adresse IP d'activation
 UpdateServerOffline=Serveur de mise à jour hors ligne
 WithCounter=Gérer un compteur
@@ -373,7 +372,7 @@ PDFDesc=Vous pouvez définir ici des options globales sur la génération des PD
 PDFAddressForging=Règles de fabrication des zones adresses
 HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TVA sur les PDF générés
 PDFLocaltax=Règles pour %s
-HideLocalTaxOnPDF=Ne pas afficher le taux de %s dans la colonne TVA
+HideLocalTaxOnPDF=Ne pas afficher le taux de %s dans la colonne taxe
 HideDescOnPDF=Cacher la description des produits sur les PDF générés
 HideRefOnPDF=Cacher la référence des produits sur les PDF générés
 HideDetailsOnPDF=Cacher les détails des lignes de produits sur les PDF générés
@@ -406,13 +405,13 @@ ExtrafieldPassword=Mot de passe
 ExtrafieldRadio=Radio bouton (choix unique)
 ExtrafieldCheckBox=Cases à cocher
 ExtrafieldCheckBoxFromList=Cases à cocher issues d'une table
-ExtrafieldLink=Lier à un objet
+ExtrafieldLink=Lien vers un objet
 ComputedFormula=Champ calculé
 ComputedFormulaDesc=Vous pouvez entrer ici une formule utilisant les propriétés objet ou tout code PHP pour obtenir des valeurs dynamiques. Vous pouvez utiliser toute formule compatible PHP, incluant l'opérateur conditionnel "?", et les objets globaux : <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATTENTION</strong> : Seulement quelques propriétés de l'objet $object pourraient être disponibles. Si vous avez besoin de propriétés non chargées, créez vous même une instance de l'objet dans votre formule, comme dans le deuxième exemple.<br>Utiliser un champs calculé signifie que vous ne pouvez pas entrer vous même toute valeur à partir de l'interface. Aussi, s'il y a une erreur de syntaxe, la formule pourrait ne rien retourner.<br><br>Exemple de formule:<br> $object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple pour recharger l'objet: <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Un autre exemple de formule pour forcer le rechargement d'un objet et de son objet parent:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Objet parent projet non trouvé'
 ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>\nPour afficher une liste dépendant d'une autre liste attribut complémentaire: <br>1, valeur1|options_<i>code_liste_parente</i>:clé_parente<br> 2,valeur2|option_<i>Code_liste_parente</i>:clé_parente<br><br>\nPour que la liste soit dépendante d'une autre liste:<br>1,valeur1|<i>code_liste_parent</i>:clef_parent<br>2,valeur2|<i>code_liste_parent</i>:clef_parent
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Les paramètres de la liste viennent d'un table<br>Syntax : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>Le filtre peut être un simple test (e.g. active=1) pour seulement montrer les valeurs actives<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez $SEL$<br>Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)<br><br>Pour avoir une liste qui dépend d'un autre attribut complémentaire:<br>\n<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pour avoir une liste qui dépend d'une autre liste:<br>\nc_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Les paramètres doivent être ObjectName: Classpath<br>Syntaxe: ObjectName:Classpath<br>Exemple: Société:societe/class/societe.class.php
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF
@@ -455,7 +454,7 @@ TheKeyIsTheNameOfHtmlField=C'est le nom du champ HTML. Cela nécessite d'avoir d
 PageUrlForDefaultValues=Vous devez entrer ici l'URL relative de la page. Si vous indiquez des paramètres dans l'URL, les valeurs par défaut seront effectives si tous les paramètres sont définis sur la même valeur. Exemples :
 PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-EnableDefaultValues=Autoriser l'enregistrement par défaut de valeurs personnalisées
+EnableDefaultValues=Activer la fonction de valeurs par défaut personnalisées
 EnableOverwriteTranslation=Activer la réécriture des traductions
 GoIntoTranslationMenuToChangeThis=Une traduction a été trouvée pour le code de cette valeur. Pour changer cette valeur, vous devez modifier le fichier depuis Accueil > Configuration > Traduction.
 WarningSettingSortOrder=Attention, le réglage d'un ordre de tri par défaut peut entraîner une erreur technique lorsque le champ est inconnu dans le listing. Si vous rencontrez une telle erreur, revenez à cette page pour supprimer l'ordre de tri par défaut et restaurer le comportement par défaut.
@@ -546,8 +545,8 @@ Module510Name=Règlement des salaires
 Module510Desc=Enregistrer et suivre le paiement des salaires des employés
 Module520Name=Emprunt
 Module520Desc=Gestion des emprunts
-Module600Name=Notifications d'événements
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
+Module600Name=Notifications d'événements métiers
+Module600Desc=Envoi de notifications par e-mails (déclenchées par des événements métiers) aux utilisateurs (configuration faite sur chaque fiche utilisateur), contacts de tiers (configuration faite sur chaque fiche tiers) ou à adresses e-mails spécifiques.
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
 Module700Name=Dons
 Module700Desc=Gestion des dons
@@ -593,7 +592,7 @@ Module5000Desc=Permet de gérer plusieurs sociétés
 Module6000Name=Workflow
 Module6000Desc=Gérer le Workflow
 Module10000Name=Sites internet
-Module10000Desc=Créer des sites internet publics avec un éditeur WYSIWYG. Indiquer à votre serveur web le chemin d'accès au à dossier  pour mettre votre site en ligne.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Gestion des demandes de congés
 Module20000Desc=Déclaration et suivi des congés des employés
 Module39000Name=Numéros de Lot/Série
@@ -771,7 +770,7 @@ Permission401=Consulter les avoirs
 Permission402=Créer/modifier les avoirs
 Permission403=Valider les avoirs
 Permission404=Supprimer les avoirs
-Permission501=Lire les fiches des contrats/salaires
+Permission501=Lire les fiches contrats/salaires
 Permission502=Créer/modifier les contrats/salaires des employés
 Permission511=Lire les règlements de salaires
 Permission512=Créer/modifier les règlements de salaires
@@ -896,7 +895,7 @@ DictionaryUnits=Unités
 DictionaryProspectStatus=Statuts de prospection
 DictionaryHolidayTypes=Type de congés
 DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
-DictionaryExpenseTaxCat=Catégories de dépenses spéciales
+DictionaryExpenseTaxCat=Catégories des notes de frais
 DictionaryExpenseTaxRange=Expense report range by category
 SetupSaved=Configuration sauvegardée
 SetupNotSaved=Configuration non enregistrée
@@ -1044,7 +1043,7 @@ SystemInfoDesc=Les informations systèmes sont des informations techniques diver
 SystemAreaForAdminOnly=Cet espace n'est accessible qu'aux utilisateurs de type administrateur. Aucune permission Dolibarr ne permet d'étendre le cercle des utilisateurs autorisés à cet espace.
 CompanyFundationDesc=Éditez sur cette page toutes les informations connues de la société ou de l'association que vous souhaitez gérer (Pour cela, cliquez sur les boutons "Modifier" ou "Sauvegarder" en bas de page)
 DisplayDesc=Vous pouvez choisir ici tous les paramètres liés à l'apparence de Dolibarr
-AvailableModules=Modules/applications instalés
+AvailableModules=Modules/applications installés
 ToActivateModule=Pour activer des modules, aller dans l'espace Configuration (Accueil->Configuration->Modules).
 SessionTimeOut=Délai expiration des sessions
 SessionExplanation=Ce nombre garanti que la session n'expire pas avant ce délai, lorsque le nettoyage des sessions est assurés par le mécanisme de nettoyage interne à PHP (et aucun autre). Le nettoyage interne de sessions PHP ne garantie pas que la session expire juste au moment de ce délai. Elle expirera après ce délai, mais au moment du nettoyage des sessions, qui a lieu toutes les <b>%s/%s</b> accès environ, mais uniquement lors d'accès fait par d'autres sessions.<br>Note : sur certains serveurs munis d'un mécanisme de nettoyage de session externe (cron sous Debian, Ubuntu…), le sessions peuvent être détruites après un délai, défini par la valeur par défaut de <strong>session.gc_maxlifetime</strong>, quelle que soit la valeur saisie ici.
@@ -1081,7 +1080,7 @@ RestoreDesc2=Restaurez le fichier archive (fichier zip par exemple) du répertoi
 RestoreDesc3=Restaurez les données, depuis le fichier « dump » de sauvegarde, dans  la base de données d'une nouvelle installation de Dolibarr ou de cette instance en cours (<b>%s</b>). Attention, une fois la restauration faite, il faudra utiliser un identifiant/mot de passe administrateur existant à l'époque de la sauvegarde pour se connecter. Pour restaurer la base dans l'installation actuelle, vous pouvez utiliser l'assistant suivant.
 RestoreMySQL=Importation MySQL
 ForcedToByAModule= Cette règle est forcée à <b>%s</b> par un des modules activés
-PreviousDumpFiles=Fichiers de sauvegarde de la base de données générés
+PreviousDumpFiles=Fichiers de sauvegarde de base de données générés
 WeekStartOnDay=Premier jour de la semaine
 RunningUpdateProcessMayBeRequired=Le lancement du processus de mise à jour semble requis (La version des programmes %s diffère de la version de la base %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Vous devez exécuter la commande sous un terminal après vous être identifié avec le compte <b>%s</b> ou ajouter -W à la fin de la commande pour fournir le mot de passe de <b>%s</b>.
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=La fonction d'envoi de mails par la méthode "PHP
 TranslationSetup=Configuration de la traduction
 TranslationKeySearch=Rechercher une traduction
 TranslationOverwriteKey=Ajouter une traduction
-TranslationDesc=Pour sélectionner la langue d'affichage de l'environnement : <br>* langue par défaut : menu <strong>Accueil - Configuration - Affichage</strong><br>* langue par utilisateur: Onglet <strong>Interface utilisateur</strong> de la fiche utilisateur (Accès a la fiche de l'utilisateur depuis l'identifiant dans l'angle supérieur droit de l'écran).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=Vous pouvez aussi écraser des valeurs en complétant/corrigeant le tableau suivant. Choisissez votre code de langue depuis la liste déroulante "%s", choisissez le code trouvé dans le fichier lang dans le champ "%s", et dans "%s" la nouvelle valeur que vous souhaitez utiliser comme nouvelle traduction.
 TranslationOverwriteDesc2=Vous pouvez utiliser l'autre onglet pour vous aider à connaître la clé de traduction à utiliser
 TranslationString=Traduction
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Règle pour la génération des mots de passe proposé
 DisableForgetPasswordLinkOnLogonPage=Ne pas afficher le lien "Mot de passe oublié" sur la page de connexion
 UsersSetup=Configuration du module utilisateurs
 UserMailRequired=Email requis pour créer un nouvel utilisateur
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=Configuration du module GRH
 ##### Company setup #####
@@ -1655,7 +1652,7 @@ ExpenseReportsSetup=Configuration du module Notes de frais
 TemplatePDFExpenseReports=Modèles de documents pour générer les document de Notes de frais
 ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Modèle de numérotation des dépenses spéciales
+ExpenseReportNumberingModules=Modèle de numérotation des notes de frais
 NoModueToManageStockIncrease=Aucun module capable d'assurer l'augmentation de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Vous pouvez trouver d'autres options pour la notification par Email en activant et configurant le module "Notification".
 ListOfNotificationsPerUser=Liste des notifications par utilisateur*
@@ -1733,7 +1730,7 @@ AddDictionaries=Ajout de dictionnaires
 AddData=Ajouter des entrées d'objets ou de dictionnaires
 AddBoxes=Ajout de widgets
 AddSheduledJobs=Ajoute des travaux programmées
-AddHooks=Ajouter de hooks
+AddHooks=Ajout de hooks
 AddTriggers=Ajout de triggers
 AddMenus=Ajout de menus
 AddPermissions=Ajout de permissions
@@ -1756,10 +1753,10 @@ BaseCurrency=Devise par défaut de votre société/institution (Voir Accueil > c
 WarningNoteModuleInvoiceForFrenchLaw=Ce module %s permet d'être conforme aux lois françaises (Loi Finance 2016 par exemple).
 WarningNoteModulePOSForFrenchLaw=Le module %s est conforme à la législation française ( Loi Finance 2016 ) car les logs non réversibles sont automatiquement activés.
 WarningInstallationMayBecomeNotCompliantWithLaw=Vous tentez d'installer le module %s qui est un module externe. L'activation d'un module externe signifie que vous faites confiance à l'éditeur du module et que vous êtes sûr que ce module ne modifie pas négativement le comportement de votre application et est conforme aux lois de votre pays (%s). Si le module apporte une fonctionnalité illégale, vous devenez responsable pour l'utilisation d'un logiciel illégal.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_PDF_MARGIN_LEFT=Marge gauche sur les PDF
+MAIN_PDF_MARGIN_RIGHT=Marge droite sur les PDF
+MAIN_PDF_MARGIN_TOP=Marge haute sur les PDF
+MAIN_PDF_MARGIN_BOTTOM=Marge bas sur les PDF
 ##### Resource ####
 ResourceSetup=Configuration du module Ressource
 UseSearchToSelectResource=Utilisez un champ avec auto-complétion pour choisir les ressources (plutôt qu'une liste déroulante).
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 30c09ef56ae..e918f30b2cd 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -35,7 +35,7 @@ AgendaAutoActionDesc= Définissez ici les événements pour lesquels Dolibarr cr
 AgendaSetupOtherDesc= Cette page permet de configurer quelques options permettant d'exporter une vue de votre agenda Dolibarr vers un calendrier externe (Thunderbird, Google calendar, …)
 AgendaExtSitesDesc=Cette page permet d'ajouter des sources de calendriers externes pour les visualiser au sein de l'agenda Dolibarr.
 ActionsEvents=Événements pour lesquels Dolibarr doit insérer un évènement dans l'agenda en automatique.
-EventRemindersByEmailNotEnabled=Les rappels d'événements par courrier électronique n'ont pas été activés dans la configuration du module Agenda.
+EventRemindersByEmailNotEnabled=Les rappels d'événements par email n'ont pas été activés dans la configuration du module Agenda.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tiers %s créé
 ContractValidatedInDolibarr=Contrat %s validé
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 95758cb0b4d..8c4f4d79ff7 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -158,5 +158,5 @@ VariousPayment=Opérations diverses
 VariousPayments=Opérations diverses
 ShowVariousPayment=Afficher les opérations diverses
 AddVariousPayment=Add miscellaneous payments
-YourSEPAMandate=Your SEPA mandate
+YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 1cbfc5dcc51..8e1e5516de4 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -149,15 +149,15 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Erreur, il n'est pas possible d'
 BillFrom=Émetteur
 BillTo=Adressé à
 ActionsOnBill=Événements sur la facture
-RecurringInvoiceTemplate=Template / Recurring invoice
+RecurringInvoiceTemplate=Modèle de facture / Facture récurrente
 NoQualifiedRecurringInvoiceTemplateFound=Pas de facture récurrente qualifiée pour la génération
 FoundXQualifiedRecurringInvoiceTemplate=%s facture(s) récurrente(s) qualifiées pour la génération
 NotARecurringInvoiceTemplate=Pas une facture récurrente
 NewBill=Nouvelle facture
 LastBills=Les %s dernières factures
 LatestTemplateInvoices=Les %s derniers modèles de factures
-LatestCustomerTemplateInvoices=Les %sdernièrs modèles de factures clients
-LatestSupplierTemplateInvoices=Les %s derniers modèles de factures fournisseurs
+LatestCustomerTemplateInvoices=Les %sdernièrs modèles de factures client
+LatestSupplierTemplateInvoices=Les %s derniers modèles de factures fournisseur
 LastCustomersBills=Les %s dernières factures client
 LastSuppliersBills=Les %s dernières factures fournisseur
 AllBills=Toutes les factures
@@ -233,7 +233,7 @@ SendReminderBillByMail=Envoyer une relance par email
 RelatedCommercialProposals=Propositions commerciales associées
 RelatedRecurringCustomerInvoices=Factures clients périodiques liées
 MenuToValid=A valider
-DateMaxPayment=Echéance
+DateMaxPayment=Date limite règlement
 DateInvoice=Date facturation
 DatePointOfTax=Date elligibilitée taxe
 NoInvoice=Aucune facture
@@ -331,13 +331,13 @@ ListOfNextSituationInvoices=Liste des factures de situation suivantes
 FrequencyPer_d=Tous les %s jour(s)
 FrequencyPer_m=Tous les %s mois
 FrequencyPer_y=Tout les %s an(s)
-FrequencyUnit=Frequency unit
+FrequencyUnit=Unité de fréquence
 toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
 NextDateToExecution=Date pour la prochaine génération de facture
 DateLastGeneration=Date de la dernière génération
 MaxPeriodNumber=Nombre maximum de génération
 NbOfGenerationDone=Nombre de génération déjà réalisées
-NbOfGenerationDoneShort=Nb of generation done
+NbOfGenerationDoneShort=Nb de génération réalisée
 MaxGenerationReached=Maximum de générations atteint
 InvoiceAutoValidate=Valider les factures automatiquement
 GeneratedFromRecurringInvoice=Généré depuis la facture modèle récurrente %s
diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
index 01e9e885569..9bed961fe46 100644
--- a/htdocs/langs/fr_FR/commercial.lang
+++ b/htdocs/langs/fr_FR/commercial.lang
@@ -70,3 +70,9 @@ Stats=Statistiques de vente
 StatusProsp=Status prospection
 DraftPropals=Propositions brouillons
 NoLimit=Pas de limite
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 0dd6f36c7bb..a6c250cd74a 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -29,7 +29,7 @@ AliasNameShort=Nom alternatif
 Companies=Sociétés
 CountryIsInEEC=Pays de la Communauté Économique Européenne
 ThirdPartyName=Nom du tiers
-ThirdPartyEmail=Third party email
+ThirdPartyEmail=E-mail de tiers
 ThirdParty=Tiers
 ThirdParties=Tiers
 ThirdPartyProspects=Prospects
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 0ce5e311818..4c9f4e0daef 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Règlement
+MenuFinancial=Facturation
 TaxModuleSetupToModifyRules=Aller dans la <a href="%s">configuration du module Taxes</a> pour modifier les règles de calcul
 TaxModuleSetupToModifyRulesLT=Aller dans la <a href="%s">configuration de l'institution</a> pour modifier les règles de calcul
 OptionMode=Option de tenue de comptabilité
@@ -31,10 +31,10 @@ Piece=Pièce
 AmountHTVATRealReceived=HT collectée
 AmountHTVATRealPaid=HT payé
 VATToPay=TVA ventes
-VATReceived=TVA encaissée
+VATReceived=TVA collectée
 VATToCollect=TVA payée
 VATSummary=Balance de TVA
-VATPaid=Taxe payée
+VATPaid=TVA payée
 LT1Summary=Tax 2 summary
 LT2Summary=Tax 3 summary
 LT1SummaryES=Balance RE
@@ -145,8 +145,8 @@ CalcModeLT2Rec= Mode <b>%sIRPF sur factures fournisseurs%s</b>
 AnnualSummaryDueDebtMode=Bilan des recettes et dépenses, résumé annuel
 AnnualSummaryInputOutputMode=Bilan des recettes et dépenses, résumé annuel
 AnnualByCompanies=Balance of income and expenses, by predefined groups of account
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
+AnnualByCompaniesDueDebtMode=Bilan des recettes et dépenses, détaillé par regroupements prédéfinis, mode <b>%sCréances-Dettes%s</b> dit <b>comptabilité d'engagement</b>.
+AnnualByCompaniesInputOutputMode=Bilan des recettes et dépenses, détaillé par regroupements prédéfinis, mode <b>%sRecettes-Dépenses%s</b> dit <b>comptabilité de caisse</b>.
 SeeReportInInputOutputMode=Cliquer sur <b>%sRecettes-Dépenses%s</b> dit <b>comptabilité de caisse</b> pour un calcul sur les paiements effectivement réalisés
 SeeReportInDueDebtMode=Cliquer sur <b>%sCréances-Dettes%s</b> dit <b>comptabilité d'engagement</b> pour un calcul sur les factures émises
 SeeReportInBookkeepingMode=See report <b>%sBookeeping%s</b> for a calculation on <b>bookkeeping table analysis</b>
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index ff67e2109fa..cee2a8f2f8c 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -35,7 +35,7 @@ ActivateAllOnContract=Activer tous les services
 CloseAContract=Clôturer un contrat
 ConfirmDeleteAContract=Êtes-vous sûr de vouloir supprimer ce contrat et tous ses services ?
 ConfirmValidateContract=Êtes-vous sûr de vouloir valider ce contrat sous la référence <b>%s</b> ?
-ConfirmActivateAllOnContract=Cela activera tous les services encore inactifs. Êtes-vous sur de vouloir activer tous les services ?
+ConfirmActivateAllOnContract=Cela activera tous les services (encore inactifs). Êtes-vous sur de vouloir activer tous les services ?
 ConfirmCloseContract=Ceci fermera tous les services actifs et inactifs. Êtes-vous sûr de vouloir clôturer ce contrat ?
 ConfirmCloseService=Êtes-vous sûr de vouloir fermer ce service à la date du <b>%s</b> ?
 ValidateAContract=Valider un contrat
@@ -88,8 +88,8 @@ ContactNameAndSignature=Pour %s, nom et signature:
 OnlyLinesWithTypeServiceAreUsed=Seules les lignes de type "Service" seront clonées
 CloneContract=Cloner le contrat
 ConfirmCloneContract=Etes vous sûr de vouloir cloner le contrat <b>%s</b> ?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
+LowerDateEndPlannedShort=Date de fin de service la plus basse parmi les services actifs
+SendContractRef=Informations contrat __REF__
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat
 TypeContact_contrat_internal_SALESREPFOLL=Commercial suivi du contrat
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index d2a89f64fda..7515dcb6675 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -61,7 +61,7 @@ CronStatusInactiveBtn=Désactiver
 CronTaskInactive=Cette tâche est désactivée
 CronId=Id
 CronClassFile=Nom de fichier intégrant la classe
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
+CronModuleHelp=Nom du dossier du module dans Dolibarr (fonctionne aussi avec les modules externes). <BR>Par exemple, pour appeler la méthode d'appel des produits Dolibarr /htdocs/<u>product</u>/class/product.class.php, la valeur du module est <br><i>product</i>.
 CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
 CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
 CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
@@ -72,7 +72,7 @@ CronFrom=A partir du
 # Info
 # Common
 CronType=Type de travail planifié
-CronType_method=Méthode d'appel de la classe PHP
+CronType_method=Appelle d'une méthode d'une classe Dolibarr
 CronType_command=Commande terminal
 CronCannotLoadClass=Impossible de charger la classe %s ou l'objet %s
 UseMenuModuleToolsToAddCronJobs=Aller à la page "Accueil - Outils administration - Travaux planifiées" pour voir la listes des travaux programmées et les modifier.
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 6d1b03f0a5a..c0d1ddea7c1 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -104,7 +104,7 @@ ErrorForbidden2=Les permissions pour cet identifiant peuvent être attribuées p
 ErrorForbidden3=Dolibarr ne semble pas fonctionner au sein d'une session authentifiée. Consultez la documentation d'installation de Dolibarr pour savoir comment gérer les authentifications (htaccess, mod_auth ou autre...).
 ErrorNoImagickReadimage=La classe Imagick n'est pas présente sur cette installation de PHP. L'aperçu n'est donc pas disponible. Les administrateurs peuvent désactiver cet onglet dans le menu Configuration - Affichage.
 ErrorRecordAlreadyExists=Enregistrement déjà existant
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=Ce libellé existe déjà
 ErrorCantReadFile=Échec de lecture du fichier '%s'
 ErrorCantReadDir=Échec de lecture du répertoire '%s'
 ErrorBadLoginPassword=Identifiant ou mot de passe incorrect
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 5080d6e6463..7ae2bedd2fc 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Annulation de la demande de congés
 EmployeeLastname=Nom du salarié
 EmployeeFirstname=Prénom du salarié
 TypeWasDisabledOrRemoved=Le type de congés (id %s) a été désactivé ou supprimé
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Dernière mise à jour automatique de l'allocation des congés
diff --git a/htdocs/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang
index 07413148bda..ec91e1bebe9 100644
--- a/htdocs/langs/fr_FR/ldap.lang
+++ b/htdocs/langs/fr_FR/ldap.lang
@@ -21,7 +21,7 @@ LDAPFieldSkypeExample=Exemple : skypeName
 UserSynchronized=Utilisateur synchronisé
 GroupSynchronized=Groupe synchronisé
 MemberSynchronized=Adhérent synchronisé
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=Type d'adhérent synchronisé
 ContactSynchronized=Contact synchronisé
 ForceSynchronize=Forcer synchro Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Échec de la lecture de l'annuaire LDAP. Vérifier la configuration du module LDAP et l'accessibilité de l'annuaire.
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 96e2747c1d6..43203f06fdc 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -69,9 +69,9 @@ ActivateCheckReadKey=Clé de sécurité permettant le chiffrement des URL utilis
 EMailSentToNRecipients=Email envoyé à %s destinataires.
 EMailSentForNElements=%s e-mails envoyés
 XTargetsAdded=<b>%s</b> destinataires ajoutés dans la liste cible
-OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=Si les documents PDF ont déjà été générés pour les objets à envoyer, ils seront ajoutés à l'e-mail en pièce jointe. Sinon, aucun e-mail ne sera envoyé. (Notez de plus que seuls les documents PDF sont gérés pour l'attachement aux pièces jointes dans l'envoi en masse dans cette version)
 AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
+GroupEmails=Regroupement emails
 OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
 WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
 ResultOfMailSending=Résultat de l'envoi d'EMail en masse
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Contacts/adresses uniques
 MailNoChangePossible=Destinataires d'un emailing validé non modifiables
 SearchAMailing=Rechercher un emailing
 SendMailing=Envoi emailing
-SendMail=Envoyer email
 SentBy=Envoyé par
 MailingNeedCommand=L'envoi d'un e-mailing peut être réalisé depuis une ligne de commande. Demandez à l'administrateur de votre serveur de lancer la commande suivante pour envoyer l'e-mailing à tous les destinataires :
 MailingNeedCommand2=Vous pouvez toutefois quand même les envoyer par l'interface écran en ajoutant le paramètre MAILING_LIMIT_SENDBYWEB avec la valeur du nombre maximum d'emails envoyés par session d'envoi. Pour cela, aller dans Accueil - Configuration - Divers.
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 5dc1b390b27..04f692a49a7 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -263,11 +263,13 @@ DateBuild=Date génération du rapport
 DatePayment=Date paiement
 DateApprove=Date approbation
 DateApprove2=Date approbation (deuxième approbation)
-RegistrationDate=Registration date
+RegistrationDate=Date d'inscription
 UserCreation=Création de l'utilisateur
 UserModification=Modification de l'utilisateur
+UserValidation=Validation user
 UserCreationShort=Création de l'utilisateur
 UserModificationShort=Modification de l'utilisateur
+UserValidationShort=Valid. user
 DurationYear=an
 DurationMonth=mois
 DurationWeek=semaine
@@ -378,15 +380,15 @@ VATIN=IGST
 VATs=TVA
 VATINs=IGST taxes
 LT1=Sales tax 2
-LT1Type=Sales tax 2 type
+LT1Type=Type de la taxe de vente 2
 LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+LT2Type=Type de la taxe de vente 3
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=Taux TVA
-DefaultTaxRate=Default tax rate
+DefaultTaxRate=Taux de taxe par défaut
 Average=Moyenne
 Sum=Somme
 Delta=Écart
@@ -608,6 +610,7 @@ SendByMail=Envoyer par email
 MailSentBy=Mail envoyé par
 TextUsedInTheMessageBody=Corps du message
 SendAcknowledgementByMail=Envoi A.R. par email
+SendMail=Envoyer email
 EMail=Email
 NoEMail=Pas d'email
 Email=Email
@@ -722,7 +725,7 @@ SetToDraft=Retour en brouillon
 ClickToEdit=Cliquer ici pour éditer
 EditWithEditor=Edit with CKEditor
 EditWithTextEditor=Éditer avec l'éditeur de texte
-EditHTMLSource=Éditer le HTML source
+EditHTMLSource=Éditer la source HTML
 ObjectDeleted=Objet %s supprimé
 ByCountry=Par pays
 ByTown=Par ville
@@ -800,7 +803,7 @@ ViewFlatList=Voir vue liste
 RemoveString=Supprimer la chaine '%s'
 SomeTranslationAreUncomplete=Certains languages pourraient n'être que partiellement traduis, ou contenir des erreurs. Si vous en détectez, vous pouvez les corriger en vous enregistrant sur <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>
 DirectDownloadLink=Lien de téléchargement direct (public/externe)
-DirectDownloadInternalLink=Lien direct de téléchargement (être connecté et autorisé)
+DirectDownloadInternalLink=Lien de téléchargement direct (requiert d'être logué et autorisé)
 Download=Téléchargement
 ActualizeCurrency=Mettre à jour le taux de devise
 Fiscalyear=Exercice fiscal
@@ -808,6 +811,10 @@ ModuleBuilder=Générateur de Module
 SetMultiCurrencyCode=Choisir la devise
 BulkActions=Actions de masse
 ClickToShowHelp=Cliquez pour montrer l'info-bulle d'aide
+Website=Site web
+WebSites=Sites web
+ExpenseReport=Note de frais
+ExpenseReports=Notes de frais
 HR=HR
 HRAndBank=HR et banque
 AutomaticallyCalculated=Calculé automatiquement
@@ -818,6 +825,9 @@ Websites=Sites web
 Events=Événements
 EMailTemplates=Modèles des courriels
 FileNotShared=File not shared to exernal public
+Project=Projet
+Projects=Projets
+Rights=Permissions
 # Week day
 Monday=Lundi
 Tuesday=Mardi
@@ -852,8 +862,8 @@ SetRef=Définir réf.
 Select2ResultFoundUseArrows=Résultats trouvés. Utilisez les flèches pour sélectionner.
 Select2NotFound=Aucun enregistrement trouvé
 Select2Enter=Entrez
-Select2MoreCharacter=caractères ou plus
-Select2MoreCharacters=caractère ou plus
+Select2MoreCharacter=caractère ou plus
+Select2MoreCharacters=caractères ou plus
 Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
 Select2LoadingMoreResults=Charger plus de résultats...
 Select2SearchInProgress=Recherche en cours...
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 16f90e67ab5..03d95abce8a 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -57,10 +57,10 @@ NewCotisation=Nouvelle adhésion
 PaymentSubscription=Paiement cotisation
 SubscriptionEndDate=Date de fin adhésion
 MembersTypeSetup=Configuration des types d'adhérents
-MemberTypeModified=Member type modified
+MemberTypeModified=Type d'adhérent modifié
 DeleteAMemberType=Delete a member type
 ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
+MemberTypeDeleted=Type d'adhérent supprimé
 MemberTypeCanNotBeDeleted=Member type can not be deleted
 NewSubscription=Nouvelle adhésion
 NewSubscriptionDesc=Ce formulaire permet de vous inscrire comme nouvel adhérent de l'association. Pour un renouvellement (si vous êtes déjà adhérent), contactez plutôt l'association par email %s.
@@ -92,7 +92,7 @@ ValidateMember=Valider un adhérent
 ConfirmValidateMember=Êtes-vous sûr de vouloir valider cet adhérent ?
 FollowingLinksArePublic=Les liens suivants sont des pages accessibles à tous et non protégées par aucune habilitation Dolibarr. Ces pages n'ont aucun formatage et sont fournies à titre d'exemple pour les associations qui veulent des scripts publics de consultation.
 PublicMemberList=Liste des membres publics
-BlankSubscriptionForm=Formulaire public d'auto-inscription
+BlankSubscriptionForm=Formulaire d'auto-inscription publique
 BlankSubscriptionFormDesc=Dolibarr peut vous fournir un URL/site web public afin de permettre aux visiteurs externes de faire une demande d'inscription à la fondation. Si un module de paiement est actif, un formulaire de paiement sera également fourni automatiquement.
 EnablePublicSubscriptionForm=Activer le formulaire d'auto-inscription public du site
 ForceMemberType=Forcer le type d'adhérent
@@ -168,8 +168,8 @@ TurnoverOrBudget=Chiffre affaire (pour société) ou Budget (asso ou collectivit
 DefaultAmount=Montant par défaut de la cotisation
 CanEditAmount=Le visiteur peut modifier/choisir le montant de sa cotisation
 MEMBER_NEWFORM_PAYONLINE=Rediriger sur la page intégrée de paiement en ligne
-ByProperties=Par caractéristiques
-MembersStatisticsByProperties=Statistiques des adhérents par caractéristiques
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Cet écran vous montre les statistiques sur les membres par nature.
 MembersByRegion=Cet écran vous montre les statistiques sur les membres par région.
 VATToUseForSubscriptions=Taux de TVA pour les adhésions
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index ceca631f05f..636b3ea5ebb 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -26,7 +26,7 @@ EnterNameOfObjectToDeleteDesc=Vous pouvez effacer un objet. ATTENTION : Tous les
 DangerZone=Zone de danger
 BuildPackage=Générer package/documentation
 BuildDocumentation=Générez la documentation
-ModuleIsNotActive=Le module n'est encore activé. Aller à %s pour l'activer ou cliquer ici :
+ModuleIsNotActive=Le module n'est pas encore activé. Aller à %s pour l'activer ou cliquer ici :
 ModuleIsLive=Ce module a été activé. Tout changement sur lui pourrait casser une fonctionnalité actuellement activée.
 DescriptionLong=Description longue
 EditorName=Nom de l'éditeur
@@ -47,30 +47,31 @@ SpecificationFile=Fichier de description des règles métiers
 LanguageFile=Fichier langue
 ConfirmDeleteProperty=Êtes-vous sûr de vouloir supprimer la propriété<strong>%s</strong> ? Cela changera le code dans la classe PHP, mais supprimera également la colonne de la définition de table d'objet.
 NotNull=Non NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Utilisé par la "recherche globale"
 DatabaseIndex=Indexation base
 FileAlreadyExists=Le fichier %s existe déjà
 TriggersFile=Fichier de code des triggers
 HooksFile=Fichier du code des hooks
-ArrayOfKeyValues=Array of key-val
+ArrayOfKeyValues=Tableau de key-val
 ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
 WidgetFile=Fichier Widget
 ReadmeFile=Fichier Readme
-ChangeLog=Fichier de log
+ChangeLog=Fichier ChangeLog
 TestClassFile=File for PHP Unit Test class
 SqlFile=Fichier SQL
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Fichier Sql pour les clés
-AnObjectAlreadyExistWithThisNameAndDiffCase=Un objet existe déjà avec ce nom
+AnObjectAlreadyExistWithThisNameAndDiffCase=Un objet existe déjà avec ce nom dans une casse différente
 UseAsciiDocFormat=Vous pouvez utiliser le format Markdown, mais il est recommandé d'utiliser le format Asciidoc (Comparaison entre .md et .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Est une mesure
 DirScanned=Répertoire scanné
-NoTrigger=Pas de déclencheur
+NoTrigger=Pas de trigger
 NoWidget=No widget
 GoToApiExplorer=Se rendre sur l'explorateur d'API
-ListOfPermissionsDefined=Liste des autorisations
+ListOfPermissionsDefined=Liste des permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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.
@@ -80,5 +81,5 @@ PermissionsDefDesc=Define here the new permissions provided by your module (once
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
+SeeReservedIDsRangeHere=Voir la plage des ID réservés
 ToolkitForDevelopers=Boîte à outils pour développeurs Dolibarr
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index f0c52aa096f..347bb2b8950 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -11,11 +11,11 @@ BirthdayAlertOn=alerte anniversaire active
 BirthdayAlertOff=alerte anniversaire inactive
 TransKey=Traduction de la clé TransKey
 MonthOfInvoice=Mois (numéro 1-12) de la date de facturation
-TextMonthOfInvoice=Mois (tex) de la date de facturation
+TextMonthOfInvoice=Mois (texte) de la date de facturation
 PreviousMonthOfInvoice=Mois précédent (numéro 1-12) la date de facturation
 TextPreviousMonthOfInvoice=Mois précédent (texte) de la date de facturation
 NextMonthOfInvoice=Le mois suivant (numéro 1-12) la date de facturation
-TextNextMonthOfInvoice=Le mois suivant (texte)  la date de facturation
+TextNextMonthOfInvoice=Le mois suivant (texte) la date de facturation
 ZipFileGeneratedInto=Fichier zip généré dans <b>%s</b>
 DocFileGeneratedInto=Fichier doc généré dans <b>%s</b>.
 JumpToLogin=Débranché. Aller à la page de connexion ...
@@ -36,8 +36,8 @@ Notify_ORDER_VALIDATE=Validation commande client
 Notify_ORDER_SENTBYMAIL=Envoi commande client par email
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envoi commande fournisseur par email
 Notify_ORDER_SUPPLIER_VALIDATE=Commande fournisseur enregistrée
-Notify_ORDER_SUPPLIER_APPROVE=Approbation commande fournisseur
-Notify_ORDER_SUPPLIER_REFUSE=Refus commande fournisseur
+Notify_ORDER_SUPPLIER_APPROVE=Commande fournisseur approuvée
+Notify_ORDER_SUPPLIER_REFUSE=Commande fournisseur refusée
 Notify_PROPAL_VALIDATE=Validation proposition commerciale client
 Notify_PROPAL_CLOSE_SIGNED=Proposition commercial fermée signée
 Notify_PROPAL_CLOSE_REFUSED=Proposition commerciale fermée refusée
@@ -47,9 +47,9 @@ Notify_WITHDRAW_CREDIT=Crédit prélèvement
 Notify_WITHDRAW_EMIT=Émission prélèvement
 Notify_COMPANY_CREATE=Tiers créé
 Notify_COMPANY_SENTBYMAIL=Email envoyé depuis la fiche Tiers
-Notify_BILL_VALIDATE=Validation facture client
+Notify_BILL_VALIDATE=Facture client validée
 Notify_BILL_UNVALIDATE=Dévalidation facture client
-Notify_BILL_PAYED=Recouvrement facture client
+Notify_BILL_PAYED=Facture client payée
 Notify_BILL_CANCEL=Annulation facture client
 Notify_BILL_SENTBYMAIL=Envoi facture client par email
 Notify_BILL_SUPPLIER_VALIDATE=Validation facture fournisseur
@@ -186,7 +186,7 @@ EMailTextInterventionAddedContact=Une nouvelle intervention %s vous a été assi
 EMailTextInterventionValidated=La fiche intervention %s vous concernant a été validée.
 EMailTextInvoiceValidated=La facture %s vous concernant a été validée.
 EMailTextProposalValidated=La proposition commerciale %s vous concernant a été validée.
-EMailTextProposalClosedSigned=The proposal %s has been closed signed.
+EMailTextProposalClosedSigned=La proposition %s a été clôturée signée.
 EMailTextOrderValidated=La commande %s vous concernant a été validée.
 EMailTextOrderApproved=La commande %s a été approuvée.
 EMailTextOrderValidatedBy=La commande %s a été enregistrée par %s
diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang
index 2cdff382cfa..f484064a6d7 100644
--- a/htdocs/langs/fr_FR/paypal.lang
+++ b/htdocs/langs/fr_FR/paypal.lang
@@ -2,7 +2,7 @@
 PaypalSetup=Configuration module PayPal
 PaypalDesc=Ce module permet d'offrir une page de paiement via le prestataire <a href="http://www.paypal.com" target="_blank">Paypal</a> pour réaliser un paiement quelconque ou un paiement par rapport à un objet Dolibarr (facture, commande…)
 PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
-PaypalDoPayment=Poursuivre le paiement par Paypal
+PaypalDoPayment=Payer par PayPal
 PAYPAL_API_SANDBOX=Mode test/bac à sable (sandbox)
 PAYPAL_API_USER=Nom utilisateur API
 PAYPAL_API_PASSWORD=Mot de passe utilisateur API
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index ca61fff3460..1fc4af6dc89 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -151,7 +151,7 @@ BuyingPrices=Prix d'achat
 CustomerPrices=Prix clients
 SuppliersPrices=Prix fournisseurs
 SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
-CustomCode=Code douane
+CustomCode=Customs/Commodity/HS code
 CountryOrigin=Pays d'origine
 Nature=Nature
 ShortLabel=Libellé court
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 1ffb2cbf55b..d7402e03706 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -3,8 +3,6 @@ RefProject=Réf. projet
 ProjectRef=Ref projet
 ProjectId=Id projet
 ProjectLabel=Libellé projet
-Project=Projet
-Projects=Projets
 ProjectsArea=Espace projets
 ProjectStatus=Statut projet
 SharedProject=Tout le monde
@@ -38,6 +36,7 @@ OpenedTasks=Tâches ouvertes
 OpportunitiesStatusForOpenedProjects=Montant des opportunités des projets ouverts par statut
 OpportunitiesStatusForProjects=Montant des opportunités des projets par statut
 ShowProject=Afficher projet
+ShowTask=Afficher tâche
 SetProject=Définir projet
 NoProject=Aucun projet défini ou responsable
 NbOfProjects=Nombre de projets
@@ -77,6 +76,7 @@ Time=Temps
 ListOfTasks=Liste de tâches
 GoToListOfTimeConsumed=Aller à la liste des temps consommés
 GoToListOfTasks=Aller à la liste des tâches
+GanttView=Gantt View
 ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
 ListOrdersAssociatedProject=Liste des commandes clients associées au projet
 ListInvoicesAssociatedProject=Liste des factures clients associées au projet
@@ -108,6 +108,7 @@ AlsoCloseAProject=Fermer également le projet (laissez-le ouvert si vous devez s
 ReOpenAProject=Réouvrir projet
 ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet ?
 ProjectContact=Contacts projet
+TaskContact=Task contacts
 ActionsOnProject=Événements sur le projet
 YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé
 UserIsNotContactOfProject=L'utilisateur n'est pas un contact/adresse de ce projet privé
@@ -115,7 +116,7 @@ DeleteATimeSpent=Suppression du temps consommé
 ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ?
 DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées
 ShowMyTasksOnly=Ne voir que les tâches qui me sont affectées
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers
 NoTasks=Aucune tâche pour ce projet
 LinkedToAnotherCompany=Liés à autre société
@@ -210,4 +211,4 @@ OppStatusLOST=Perdu
 Budget=Budget
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
+AllowCommentOnProject=Autoriser les commentaires utilisateur sur les projets
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 77c5e06296c..f8d14ff8bb1 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilisé pour les utilisateurs
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte comptable défini sur la carte utilisateur sera utilisé uniquement pour le compte secondaire. Celui-ci sera utilisé pour le grand livre général et comme valeur par défaut de la comptabilité secondaire, si le compte dédié d'utilisation d'un utilisateur sur l'utilisateur n'est pas défini.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte comptable défini sur la carte utilisateur sera utilisé uniquement pour la comptabilité auxiliaire. Celui-ci sera utilisé pour le grand livre et comme valeur par défaut de la comptabilité auxiliaire si le compte dédié de l'utilisateur n'est pas défini.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les charges de personnel
 Salary=Salaire
 Salaries=Salaires
@@ -13,3 +13,5 @@ TJM=Tarif journalier moyen
 CurrentSalary=Salaire actuel
 THMDescription=Cette valeur peut être utilisé pour calculer le coût horaire consommé dans un projet suivi par utilisateurs si le module projet est utilisé
 TJMDescription=Cette valeur est actuellement seulement une information et n'est utilisé pour aucun calcul
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index 3d0363edec5..1071d5f23f9 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -18,13 +18,13 @@ SendingCard=Fiche expédition
 NewSending=Nouvelle expédition
 CreateShipment=Créer expédition
 QtyShipped=Qté. expédiée
-QtyShippedShort=Qty ship.
+QtyShippedShort=Qté exp.
 QtyPreparedOrShipped=Quantité préparée ou envoyée
 QtyToShip=Qté. à expédier
 QtyReceived=Qté. reçue
 QtyInOtherShipments=Qté dans les autres expéditions
 KeepToShip=Reste à expédier
-KeepToShipShort=Remain
+KeepToShipShort=Reste
 OtherSendingsForSameOrder=Autres expéditions pour cette commande
 SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
 SendingsToValidate=Expéditions à valider
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index b94f35389b2..e1e5a75a435 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -22,6 +22,7 @@ Movements=Mouvements
 ErrorWarehouseRefRequired=Le nom de référence de l'entrepôt est obligatoire
 ListOfWarehouses=Liste des entrepôts
 ListOfStockMovements=Liste des mouvements de stock
+MovementId=Movement ID
 StockMovementForId=ID mouvement %d
 ListMouvementStockProject=Liste des mouvements de stocks associés au projet
 StocksArea=Espace entrepôts
@@ -49,7 +50,7 @@ EnhancedValue=Valorisation
 PMPValue=Valorisation (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valorisation des stocks
-UserWarehouseAutoCreate=Créer automatiquement un entrepôt lié à un nouvel utilisateur
+UserWarehouseAutoCreate=Créer automatiquement un stock/entrepôt propre à l'utilisateur lors de sa création
 AllowAddLimitStockByWarehouse=Autoriser l'ajout d'une limite et d'un stock désiré par produit et entrepôt à la place de produit seul
 IndependantSubProductStock=Le stock du produit et le stock des sous-produits sont indépendant
 QtyDispatched=Quantité ventilée
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Le niveau de stock doit être suffisant pour ajouter
 StockMustBeEnoughForOrder=Le niveau de stock doit être suffisant pour ajouter ce produit/service à la commande (la vérification est faite sur le stock réel lors de l'ajout de la ligne de commande, quelquesoit la règle de modification automatique de stock)
 StockMustBeEnoughForShipment= Le niveau de stock doit être suffisant pour ajouter ce produit/service à l'expédition (la vérification est faite sur le stock réel lors de l'ajout de la ligne à l'expédition, quelquesoit la règle de modification automatique de stock)
 MovementLabel=Libellé du mouvement
+DateMovement=Date of movement
 InventoryCode=Code mouvement ou inventaire
 IsInPackage=Inclus dans un package
 WarehouseAllowNegativeTransfer=Le stock peut être négatif
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index 4e2d02a85fd..0ec18ab7f03 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -12,7 +12,7 @@ YourEMail=Email de confirmation du paiement
 STRIPE_PAYONLINE_SENDEMAIL=Email à prévenir en cas de paiement (succès ou non)
 Creditor=Bénéficiaire
 PaymentCode=Code de paiement
-StripeDoPayment=Paiement en carte de crédit/débit (Stripe)
+StripeDoPayment=Payer par carte de crédit/débit (Stripe)
 YouWillBeRedirectedOnStripe=Vous allez être redirigé vers la page sécurisée de Stripe pour insérer les informations de votre carte de crédit
 Continue=Continuer
 ToOfferALinkForOnlinePayment=URL de paiement %s
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 77777d226e7..a9a2631ac00 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Note de frais
-ExpenseReports=Notes de frais
 ShowExpenseReport=Afficher la note de frais
 Trips=Note de frais
 TripsAndExpenses=Notes de frais
@@ -12,6 +10,8 @@ ListOfFees=Liste des notes de frais
 TypeFees=Types de déplacement et notes de frais
 ShowTrip=Afficher la note de frais
 NewTrip=Nouvelle note de frais
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Société/organisation visitée
 FeesKilometersOrAmout=Montant ou kilomètres
 DeleteTrip=Supprimer les notes de frais / déplacements
@@ -54,7 +54,7 @@ EX_FUE=Fuel CV
 EX_HOT=Hôtel
 EX_PAR=Parking CV
 EX_TOL=Toll CV
-EX_TAX=Various Taxes
+EX_TAX=Taxes diverses
 EX_IND=Indemnity transportation subscription
 EX_SUM=Maintenance supply
 EX_SUO=Office supplies
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Vous avez déclaré une autre note de frais dans une période similaire.
 AucuneLigne=Aucune note de frais déclarée
@@ -132,7 +134,7 @@ ExpenseReportDateStart=Date début
 ExpenseReportDateEnd=Date fin
 ExpenseReportLimitAmount=Montant limite
 ExpenseReportRestrictive=Restrictive
-AllExpenseReport=Tout type de rapport de dépenses
+AllExpenseReport=Tout type de note de frais
 OnExpense=Expense line
 ExpenseReportRuleSave=Expense report rule saved
 ExpenseReportRuleErrorOnSave=Erreur: %s
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 4ada2e17ee9..cb088c1dba4 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -5,19 +5,18 @@ DeleteWebsite=Effacer site web
 ConfirmDeleteWebsite=Êtes-vous sûr de vouloir supprimer ce site web. Toutes les pages et le contenu seront également supprimés.
 WEBSITE_PAGENAME=Nom/alias de la page
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL du fichier de la feuille de style (CSS) externe
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_ROBOT=Robot file (robots.txt)
-WEBSITE_HTACCESS=Web site .htaccess file
+WEBSITE_JS_INLINE=Contenu du fichier Javascript (commun à toutes les pages)
+WEBSITE_ROBOT=Fichier robot (robots.txt)
+WEBSITE_HTACCESS=Fichier .htaccess du site web
 PageNameAliasHelp=Nom ou alias de la page. <br>Cet alias est également utilisé pour forger une URL SEO lorsque le site Web est exécuté à partir d'un hôte virtuel d'un serveur Web (comme Apache, Nginx, ...). Utilisez le bouton "<strong>1%s</strong>" pour modifier cet alias.
 MediaFiles=Répertoire de médias
 EditCss=Editer  l'en-tête HTML ou Style/CSS
 EditMenu=Modifier menu
 EditMedias=Editer médias
 EditPageMeta=Modifier métadonnées
-Website=Site web
 AddWebsite=Ajouter site web
 Webpage=Page/contenair Web
 AddPage=Ajouter une page/contenair
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL du virtual host servit par le serveur web externe n
 NoPageYet=Pas de page pour l'instant
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Cloner la page/contenair
 CloneSite=Cloner le site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=La nouvelle page est une traduction de la page en cours ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -51,4 +51,7 @@ CreateByFetchingExternalPage=Create page/container by fetching page from externa
 OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Récupérer et Créer
 ExportSite=Exporter site
-IDOfPage=Id of page
+IDOfPage=Id de page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 2a1bd6576f0..ff520a13625 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -55,8 +55,8 @@ StatusMotif5=Numéro de compte inexploitable
 StatusMotif6=Compte solde
 StatusMotif7=Décision judiciaire
 StatusMotif8=Autre motif
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
+CreateForSepaFRST=Créer fichier de prélèvement (SEPA FRST)
+CreateForSepaRCUR=Créer fichier de prélèvement (SEPA RCUR)
 CreateAll=Create direct debit file (all)
 CreateGuichet=Seulement guichet
 CreateBanque=Seulement banque
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index f2bf960c9fc..b92c00521fe 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (שפת הדפדפן)
 FeatureDisabledInDemo=התכונה זמינה ב דמו
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=הרשאות
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=האלמנטים היחידים של <a href="%s">מודולים המאפשרים</a> מוצגים.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=מאפשר לך לנהל מספר רב של חברות
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=כלל לייצר סיסמאות או שהציע לא
 DisableForgetPasswordLinkOnLogonPage=אל תציג את הקישור &quot;שכח סיסמה&quot; בדף הכניסה
 UsersSetup=משתמשים מודול ההתקנה
 UserMailRequired=דוא&quot;ל נדרש ליצור משתמש חדש
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/he_IL/commercial.lang b/htdocs/langs/he_IL/commercial.lang
index 0f4c6c853af..0b5c12338bb 100644
--- a/htdocs/langs/he_IL/commercial.lang
+++ b/htdocs/langs/he_IL/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang
index b7080440737..6a8e6755f7a 100644
--- a/htdocs/langs/he_IL/holiday.lang
+++ b/htdocs/langs/he_IL/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 25d9dc72e9e..9f889a04584 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 83d1a966316..48fcd7b8760 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=פרוייקטים
+Rights=הרשאות
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index 82fbf526ed3..5c723b79a41 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/he_IL/modulebuilder.lang b/htdocs/langs/he_IL/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/he_IL/modulebuilder.lang
+++ b/htdocs/langs/he_IL/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index bd5ed2931cd..a2a001b3b3a 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=פרוייקטים
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=הצג משימה
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/he_IL/salaries.lang
+++ b/htdocs/langs/he_IL/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 6afbab53d2d..fd28ba7afac 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang
index b203294cd46..bd51e00b8d4 100644
--- a/htdocs/langs/he_IL/trips.lang
+++ b/htdocs/langs/he_IL/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index c67bb744d15..57073b8e6b5 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Automatski detektiraj (jezik web preglednika)
 FeatureDisabledInDemo=Mogučnost onemogućena u demo verziji
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Prava pristupa
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Prikazani su samo elementi sa  <a href="%s">omogučenih modula</a>
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Dozvoljava upravljanje multi tvrtkama
 Module6000Name=Tijek rada
 Module6000Desc=Upravljanje tijekom rada
 Module10000Name=Web lokacije
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Upravljanje zahtjevima odlazaka
 Module20000Desc=Objavi i prati zahtjeve odsutnosti zaposlenika
 Module39000Name=Lot proizvoda
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Postavke prijevoda
 TranslationKeySearch=Pretraži prijevod po ključi ili tekstu
 TranslationOverwriteKey=Prepiši prevedeni tekst
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Prevedeni tekst
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Ne prikazuj poveznicu "Zaboravili ste lozinku" na stranici prijave
 UsersSetup=Podešavanje modula korisnka
 UserMailRequired=E-pošta je obavezna za kreiranje novog korisnika
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=Podešavanje modula HRM
 ##### Company setup #####
diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
index 3c01c891c95..d8ec607f214 100644
--- a/htdocs/langs/hr_HR/commercial.lang
+++ b/htdocs/langs/hr_HR/commercial.lang
@@ -70,3 +70,9 @@ Stats=Statistike prodaje
 StatusProsp=Status potencijalnog kupca
 DraftPropals=Skica ponude
 NoLimit=Bez ograničenja
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index 93af8f829fc..419b932781c 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Odbijanje zahtjeva
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Zadnje automatsko ažuriranje raspodjele odlazaka
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 6438449c87f..af0ae9a6367 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 5df0ea6bbcc..310e445a07d 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Datum odobrenja (drugo odobrenje)
 RegistrationDate=Registration date
 UserCreation=Kreiranje korisnika
 UserModification=Izmjena korisnika
+UserValidation=Validation user
 UserCreationShort=Kreir. korisnika
 UserModificationShort=izmj. korisnika
+UserValidationShort=Valid. user
 DurationYear=godina
 DurationMonth=mjesec
 DurationWeek=tjedan
@@ -608,6 +610,7 @@ SendByMail=Poslano putem e-pošte
 MailSentBy=E-poštu poslao
 TextUsedInTheMessageBody=Tijelo e-pošte
 SendAcknowledgementByMail=Pošalji e-poštu potvrde
+SendMail=Send email
 EMail=E-pošta
 NoEMail=Nema e-pošte
 Email=E-pošta
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Website
+WebSites=Web sites
+ExpenseReport=Izvještaj troška
+ExpenseReports=Izvještaji troška
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Događaj
 EMailTemplates=Predlošci e-pošte
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projekti
+Rights=Prava pristupa
 # Week day
 Monday=Ponedjeljak
 Tuesday=Utorak
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 9b5905c3fb7..be78c3987ae 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Promet (za tvrtke) ili proračun (za zaklade)
 DefaultAmount=Zadani iznos pretplate
 CanEditAmount=Posjetitelj može odabrati/mjenjati iznos svoje pretplate
 MEMBER_NEWFORM_PAYONLINE=Idi na integriranu stranicu online plaćanja
-ByProperties=Po karakteristikama
-MembersStatisticsByProperties=Statistika članova po karakteristikama
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Ovaj ekran prikazuje statistiku članova po vrsti.
 MembersByRegion=Ovaj ekran prikazuje statistiku članova po regiji.
 VATToUseForSubscriptions=PDV stopa za pretplate
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 1d7299d9884..2b2f5407b4a 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. projekt
 ProjectRef=Projekt ref.
 ProjectId=Projekt ID
 ProjectLabel=Oznaka projekta
-Project=Projekt
-Projects=Projekti
 ProjectsArea=Sučelje projekata
 ProjectStatus=Status projekta
 SharedProject=Svi
@@ -38,6 +36,7 @@ OpenedTasks=Otvoreni zadaci
 OpportunitiesStatusForOpenedProjects=Mogući iznos otvorenih projekata po statusu
 OpportunitiesStatusForProjects=Iznos šanse za projekte po statusu
 ShowProject=Prikaži projekt
+ShowTask=Prikaži zadatak
 SetProject=Postavi projekt
 NoProject=Nema definiranih ili vlastih projekata
 NbOfProjects=Br. projekata
@@ -77,6 +76,7 @@ Time=Vrijeme
 ListOfTasks=Popis zadataka
 GoToListOfTimeConsumed=Idi na popis utrošenog vremena
 GoToListOfTasks=Idi na popis zadataka
+GanttView=Gantt View
 ListProposalsAssociatedProject=Popis ponuda dodjeljenih projektu
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Otvori projekti
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
+TaskContact=Task contacts
 ActionsOnProject=Događaji projekta
 YouAreNotContactOfProject=Niste kontakt za ovaj privatni projekti
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Obriši utrošeno vrijeme
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Vidi također zadatke koji nisu dodjeljeni meni
 ShowMyTasksOnly=Vidi samo zadatke dodjeljene meni
-TaskRessourceLinks=Resursi
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekti posvećeni komitentu
 NoTasks=Nema zadataka u ovom projektu
 LinkedToAnotherCompany=Povezano s drugim komitentom
diff --git a/htdocs/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang
index d39faa96e4b..2180b26d56b 100644
--- a/htdocs/langs/hr_HR/salaries.lang
+++ b/htdocs/langs/hr_HR/salaries.lang
@@ -13,3 +13,5 @@ TJM=Prosječna dnevnica
 CurrentSalary=Trenutna plaća
 THMDescription=Ova vrijednost može se koristiti za izračun troškova utrošenog vremena na projektu unesenog od korisnika ako se korisit modul projekt
 TJMDescription=Ova vrijednost je informativna i ne koristi se niti u jednom izračunu
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 76139fae951..2383668e41f 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -22,6 +22,7 @@ Movements=Kretanja
 ErrorWarehouseRefRequired=Referenca skladišta je obavezna
 ListOfWarehouses=Popis skladišta
 ListOfStockMovements=Popis kretanja zaliha
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Sučelje skladišta
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stanje zaliha mora biti dovoljna za dodavanje proizv
 StockMustBeEnoughForOrder=Stanje zaliha mora biti dovoljna za dodavanje proizvoda/usluga na narudžbu (provjera se radi na trenutnoj stvarnoj zalihi kod dodavanja stavke na narudžbu bez obzira koje je pravilo za automatsku promjenu zalihe)
 StockMustBeEnoughForShipment= Stanje zaliha mora biti dovoljna za dodavanje proizvoda/usluga na otpremincu (provjera se radi na trenutnoj stvarnoj zalihi kod dodavanja stavke na otpremnicu bez obzira koje je pravilo za automatsku promjenu zalihe)
 MovementLabel=Oznaka kretanja
+DateMovement=Date of movement
 InventoryCode=Kretanje ili inventarni kod
 IsInPackage=Sadržane u grupiranim proizvodima
 WarehouseAllowNegativeTransfer=Zaliha ne može biti negativna
diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
index 722c3b7aec4..5cb82e0bd08 100644
--- a/htdocs/langs/hr_HR/trips.lang
+++ b/htdocs/langs/hr_HR/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Izvještaj troška
-ExpenseReports=Izvještaji troška
 ShowExpenseReport=Prikaži izvještaj troška
 Trips=Izvještaji troška
 TripsAndExpenses=Izvještaji troškova
@@ -12,6 +10,8 @@ ListOfFees=Popis pristojbi
 TypeFees=Tipovi pristojbi
 ShowTrip=Prikaži izvještaj troška
 NewTrip=Novi izvještaj troška
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Iznos ili kilometri
 DeleteTrip=Obriši izvještaj troška
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Objavili ste još jedan izvještaj troška u sličnom razdoblju.
 AucuneLigne=Još nije objavljen izvještaj troška
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 68b141714bf..cbe6e203b26 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Obriši Web mjesto
 ConfirmDeleteWebsite=Jeste li sigurni da želite obrisati ovo web mjesto. Sve stranice i sadržaj biti će isto obrisan.
 WEBSITE_PAGENAME=Naziv stranice/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL vanjske CSS datoteke
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Uredi izbornik
 EditMedias=Edit medias
 EditPageMeta=Uredi meta
-Website=Website
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 1b674b8c829..61656d0e490 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Automatikus nyelvfelismerés (a böngésző nyelve)
 FeatureDisabledInDemo=Demó módban kikapcsolva
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Engedélyek
 BoxesDesc=A widgetek olyan elemek melyek segítségével egyes oldalak testreszabhatók. A widget ki/bekapcsolását a cél-oldal kiválasztásával az 'Aktiválás'-ra kattintva érheti el illetve a kukára kattintva kikapcsolhatja.
 OnlyActiveElementsAreShown=Csak a <a href="%s"> bekapcsolt modulok</a> elemei jelennek meg.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Több vállalat kezelését teszi lehetővé
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Weboldalak
-Module10000Desc=Publikus weboldalak készítése WYSIWG szerkesztővel. A kijelölt könyvtárra mutató webszerver konfigurációval Interneten is megjelenítheti az oldalakat.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=A "PHP mail direct" metódus választása esetén
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Szabály generálni jelszavakat, vagy javasolt validá
 DisableForgetPasswordLinkOnLogonPage=Ne jelenjen meg a link &quot;Elfelejtett jelszó&quot; a belépés oldalra
 UsersSetup=Felhasználók modul beállítása
 UserMailRequired=E-mail létrehozásához szükséges új felhasználó
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/hu_HU/commercial.lang b/htdocs/langs/hu_HU/commercial.lang
index 31e37899055..ed9c47f1006 100644
--- a/htdocs/langs/hu_HU/commercial.lang
+++ b/htdocs/langs/hu_HU/commercial.lang
@@ -70,3 +70,9 @@ Stats=Eladási statisztikák
 StatusProsp=Prospect állapot
 DraftPropals=Készítsen üzleti ajánlatot
 NoLimit=Nincs határ
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang
index 27ecc071b92..8f0ca2eebb6 100644
--- a/htdocs/langs/hu_HU/holiday.lang
+++ b/htdocs/langs/hu_HU/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index aca971a9b65..592ec6323a7 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Egyedi kapcsolatok a vállalatok
 MailNoChangePossible=A címzettek validált emailing nem lehet megváltoztatni
 SearchAMailing=Keresés levelezési
 SendMailing=Küldés e-mailezés
-SendMail=E-mail küldése
 SentBy=Által küldött
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Ön azonban elküldheti őket az interneten hozzáadásával paraméter MAILING_LIMIT_SENDBYWEB az értéke max e-mailek száma szeretne küldeni a session. Ehhez menj a Home - telepítés - Más.
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 2eeb0395aa0..df63488333f 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Jóváhagyás dátuma (megerősítés)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Létrehozó felhasználó
 UserModificationShort=Módosító felhasználó
+UserValidationShort=Valid. user
 DurationYear=év
 DurationMonth=hónap
 DurationWeek=hét
@@ -608,6 +610,7 @@ SendByMail=Küldés emailben
 MailSentBy=Email feladója
 TextUsedInTheMessageBody=Email tartalma
 SendAcknowledgementByMail=Megerősítő email küldése
+SendMail=E-mail küldése
 EMail=E-mail
 NoEMail=Nincs email
 Email=E-mail
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Állítsa be a pénznemet
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Költség kimutatások
 HR=Személyügy
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatikusan számolva
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Cselekvések
 EMailTemplates=E-mail sablonok
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projektek
+Rights=Engedélyek
 # Week day
 Monday=Hétfő
 Tuesday=Kedd
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 96252d35447..55b10d1b68c 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Forgalom (a cég) vagy Költségvetés (egy alapítvány)
 DefaultAmount=Alapértelmezett mennyiségű előfizetés
 CanEditAmount=Látogató lehet választani / szerkeszteni összegénél előfizetés
 MEMBER_NEWFORM_PAYONLINE=Ugrás az integrált online fizetési oldalra
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 32ddd207a92..e7c472c9429 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Projekt
-Projects=Projektek
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Mindenki
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Projektek mutatása
+ShowTask=Feladat mutatása
 SetProject=Projekt beállítása
 NoProject=Nincs létrehozott vagy tulajdonolt projekt
 NbOfProjects=Projektek száma
@@ -77,6 +76,7 @@ Time=Idő
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=A projekthez tartozó kereskedelmi ajánlatok listája
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Projekt nyitása
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kapcsolatok
+TaskContact=Task contacts
 ActionsOnProject=Projekteh tartozó cselekvések
 YouAreNotContactOfProject=Nem kapcsolata ennek a privát projektnek
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Eltöltött idő törlése
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Erőforrások
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Harmadik félhnek dedikált projektek
 NoTasks=Nincs a projekthez tartozó feladat
 LinkedToAnotherCompany=Harmadik félhez kapcsolva
diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/hu_HU/salaries.lang
+++ b/htdocs/langs/hu_HU/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 1c34ec9f58d..3973e976150 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -22,6 +22,7 @@ Movements=Mozgások
 ErrorWarehouseRefRequired=Raktár referencia név szükséges
 ListOfWarehouses=Raktárak listája
 ListOfStockMovements=Készlet mozgatások listája
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Raktárak
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=A készletnek elegendőnek kell lennie a termék/szo
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Mozgás címkéje
+DateMovement=Date of movement
 InventoryCode=Mozgás vagy leltár kód
 IsInPackage=Csomag tartalmazza
 WarehouseAllowNegativeTransfer=A készlet lehet negatív
diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang
index 0c89772b144..76dac84374d 100644
--- a/htdocs/langs/hu_HU/trips.lang
+++ b/htdocs/langs/hu_HU/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Költség kimutatások
 ShowExpenseReport=Show expense report
 Trips=Költség kimutatások
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Költségek listája
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Kilóméterek száma
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 37e7c257a83..72253913d4e 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=A honlap törlése
 ConfirmDeleteWebsite=Biztos benne, hogy le akarja törölni a honlapot? Az összes oldal és tartalom el fog veszni!
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index a6cd3d3d0e4..f3c77e64a45 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Izin
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/id_ID/commercial.lang b/htdocs/langs/id_ID/commercial.lang
index 34142333e92..f36e679352b 100644
--- a/htdocs/langs/id_ID/commercial.lang
+++ b/htdocs/langs/id_ID/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index 2658e9ec469..dda30ac99fb 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 9942c26475b..ae5eeb00d77 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index b150c9eab0c..b149edbd103 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Acara
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Izin
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 510ea1758f0..23cf51f2172 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index c09c4f7e937..5865ec44216 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index 52d9b4b190b..2bcb6857186 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 6e739958a29..21654437ae9 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/id_ID/trips.lang b/htdocs/langs/id_ID/trips.lang
index e24ea4d4cd5..e8a667e10a0 100644
--- a/htdocs/langs/id_ID/trips.lang
+++ b/htdocs/langs/id_ID/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 1b02a24a5c8..b50f2d8528b 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Finna sjálfkrafa (vafrara tungumál)
 FeatureDisabledInDemo=Lögun fatlaður í kynningu
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Heimildir
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Aðeins atriði frá <a href="%s">virkt einingar</a> eru birtar.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Leyfir þér að stjórna mörgum fyrirtækjum
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Regla til að mynda lagt lykilorð eða sannprófa lyk
 DisableForgetPasswordLinkOnLogonPage=Ekki sýna á tengilinn "Gleymt aðgangsorð" á innskráningarsíðu
 UsersSetup=Notendur mát skipulag
 UserMailRequired=Netfang sem þarf til að búa til nýjan notanda
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/is_IS/commercial.lang b/htdocs/langs/is_IS/commercial.lang
index 38fb3992d40..5df913f5695 100644
--- a/htdocs/langs/is_IS/commercial.lang
+++ b/htdocs/langs/is_IS/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect stöðu
 DraftPropals=Drög auglýsing tillögur
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang
index 5032b8de58f..381744c546d 100644
--- a/htdocs/langs/is_IS/holiday.lang
+++ b/htdocs/langs/is_IS/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 6777d7b741a..c8c51bb00bc 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Einstök tengiliðum fyrirtækja
 MailNoChangePossible=Viðtakendur fyrir staðfestar póst getur ekki breytt
 SearchAMailing=Leita póstlista
 SendMailing=Senda póst
-SendMail=Senda tölvupóst
 SentBy=Sendur
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Þú getur hins vegar sent þær á netinu með því að bæta breytu MAILING_LIMIT_SENDBYWEB við gildi frá fjölda max tölvupóst þú vilt senda við setu.
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index cc04c62e17f..74db7f962e9 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=ár
 DurationMonth=mánuður
 DurationWeek=viku
@@ -608,6 +610,7 @@ SendByMail=Senda í tölvupósti
 MailSentBy=Email sent
 TextUsedInTheMessageBody=Email líkami
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Senda tölvupóst
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Viðburðir
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Verkefni
+Rights=Heimildir
 # Week day
 Monday=Mánudagur
 Tuesday=Þriðjudagur
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 9e81c74e44f..40ddd28efd3 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Velta (fyrir fyrirtæki) eða fjárhagsáætlun (um stofnun)
 DefaultAmount=Sjálfgefin magn af áskrift
 CanEditAmount=Gestur geta valið / breyta upphæð áskrift sína
 MEMBER_NEWFORM_PAYONLINE=Stökkva á samþætt netinu greiðslu síðu
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/is_IS/modulebuilder.lang b/htdocs/langs/is_IS/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/is_IS/modulebuilder.lang
+++ b/htdocs/langs/is_IS/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index bfe715cea7e..cf73a4c987d 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Verkefni
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Allir
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Sýna verkefni
+ShowTask=Sýna verkefni
 SetProject=Setja verkefni
 NoProject=Engin verkefni skilgreind eða í eigu
 NbOfProjects=ATH verkefna
@@ -77,6 +76,7 @@ Time=Tími
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Listi yfir auglýsing tillögum í tengslum við verkefnið
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Opna verkefni
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project tengiliðir
+TaskContact=Task contacts
 ActionsOnProject=Aðgerðir á verkefninu
 YouAreNotContactOfProject=Þú ert ekki samband við þessa einka verkefni
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Eyða tíma
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Gagnagrunnur
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Verkefni hollur til þessa þriðja aðila
 NoTasks=Engin verkefni fyrir þetta verkefni
 LinkedToAnotherCompany=Tengjast öðrum þriðja aðila
diff --git a/htdocs/langs/is_IS/salaries.lang b/htdocs/langs/is_IS/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/is_IS/salaries.lang
+++ b/htdocs/langs/is_IS/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 7442b4f8396..233e81bfd6a 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -22,6 +22,7 @@ Movements=Hreyfing
 ErrorWarehouseRefRequired=Lager tilvísun nafn er krafist
 ListOfWarehouses=Listi yfir vöruhús
 ListOfStockMovements=Listi yfir hreyfingar lager
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/is_IS/trips.lang b/htdocs/langs/is_IS/trips.lang
index 19b3c603c4b..aa834266e35 100644
--- a/htdocs/langs/is_IS/trips.lang
+++ b/htdocs/langs/is_IS/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Listi yfir gjöld
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Magn eða kílómetrar
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 6964dd649c6..61bcaccc5f2 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignora errori per record duplicati (INSERT IGNORE)
 AutoDetectLang=Rileva automaticamente (lingua del browser)
 FeatureDisabledInDemo=Funzione disabilitata in modalità demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Autorizzazioni
 BoxesDesc=I Widgets sono componenti che personalizzano le pagine aggiungendo delle informazioni.\nPuoi scegliere se mostrare il widget o meno cliccando 'Attiva' sulla la pagina di destinazione, o cliccando sul cestino per disattivarlo.
 OnlyActiveElementsAreShown=Vengono mostrati solo gli elementi relativi ai <a href="%s">moduli attivi</a> .
 ModulesDesc=I moduli di Dolibarr definiscono quali funzionalità sono abilitate. Alcuni moduli, dopo la loro attivazione, richiedono dei permessi da abilitare agli utenti. Clicca su on/off per l'abilitazione del modulo.
@@ -593,7 +592,7 @@ Module5000Desc=Permette la gestione di diverse aziende
 Module6000Name=Flusso di lavoro
 Module6000Desc=Gestione flussi di lavoro
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Gestione delle richieste di permesso
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Lotto di produzione
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Configurazione della traduzione
 TranslationKeySearch=Cerca una chiave o una stringa di testo
 TranslationOverwriteKey=Sovrascrivi una stringa di testo
-TranslationDesc=La scelta della lingua visualizzata su schermo può essere modidificata:<br><br> - Globalmente dal menu <strong>Home > Impostazioni > Layout di visualizzazione</strong><br> - Per utente dalla linguetta <strong>Impostazioni interfaccia grafica</strong> della Scheda utente (cliccare l'icona di login in alto sullo schermo).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=Puoi anche effettuare l'override delle stringhe di testo utilizzando la tabella seguente. Seleziona la tua lingua nel box "%s", inserisci la chiave della stringa da tradurre nel campo "%s" e la tua traduzione nel campo "%s".
 TranslationOverwriteDesc2=Puoi utilizzare il tab di ricerca per individuare la chiave della stringa di tuo interesse
 TranslationString=Stringa di testo
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Regola per generare le password automaticamente
 DisableForgetPasswordLinkOnLogonPage=Non mostrare il link <b>Hai dimenticato la password?</b> nella pagina di accesso
 UsersSetup=Impostazioni modulo utenti
 UserMailRequired=È obbligatorio inserire un indirzzo email per creare un nuovo utente
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=Impostazioni modulo risorse umane
 ##### Company setup #####
diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
index 12a975b7f94..a8c218f4b0b 100644
--- a/htdocs/langs/it_IT/commercial.lang
+++ b/htdocs/langs/it_IT/commercial.lang
@@ -70,3 +70,9 @@ Stats=Statistiche vendite
 StatusProsp=Stato del cliente potenziale
 DraftPropals=Bozze di proposte commerciali
 NoLimit=Nessun limite
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index 223f52d7b66..868563a0586 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Cancellazione ferie
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Ultimo aggiornamento automatico dell'assegnazione ferie
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index a65484c8ad9..89202ab109f 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Numero contatti di società
 MailNoChangePossible=I destinatari convalidati non possono essere modificati
 SearchAMailing=Cerca invio
 SendMailing=Invia email massiva
-SendMail=Invia una email
 SentBy=Inviato da
 MailingNeedCommand=L'invio di un mailing si può fare da linea di comando. Chiedi all'amministratore del server di eseguire il seguente comando per inviare il mailing a tutti i destinatari:
 MailingNeedCommand2=Puoi inviare comunque online aggiungendo il parametro MAILING_LIMIT_SENDBYWEB impostato al valore massimo corrispondente al numero di email che si desidera inviare durante una sessione.
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 5f9dd9f9ba4..cb893c6407a 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Data di approvazione (seconda approvazione)
 RegistrationDate=Registration date
 UserCreation=Creazione utente
 UserModification=Modifica utente
+UserValidation=Validation user
 UserCreationShort=Creaz. utente
 UserModificationShort=Modif. utente
+UserValidationShort=Valid. user
 DurationYear=anno
 DurationMonth=mese
 DurationWeek=settimana
@@ -608,6 +610,7 @@ SendByMail=Invia per email
 MailSentBy=Email inviate da
 TextUsedInTheMessageBody=Testo dell'email
 SendAcknowledgementByMail=Invia email di conferma
+SendMail=Invia una email
 EMail=E-mail
 NoEMail=Nessuna email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Sito web
+WebSites=Web sites
+ExpenseReport=Nota spese
+ExpenseReports=Nota spese
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Eventi
 EMailTemplates=Modelli email
 FileNotShared=File not shared to exernal public
+Project=Progetto
+Projects=Progetti
+Rights=Autorizzazioni
 # Week day
 Monday=Lunedì
 Tuesday=Martedì
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index d3d065eb9f6..a6592070d28 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Giro d'affari (aziende) o Budget (fondazione)
 DefaultAmount=Quota di adesione predefinita
 CanEditAmount=I visitatori possono scegliere/modificare l'ammontare della propria quota
 MEMBER_NEWFORM_PAYONLINE=Saltate sulla integrato pagina di pagamento online
-ByProperties=Per natura
-MembersStatisticsByProperties=Statistiche dei membri per natura
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Questa schermata mostra le statistiche dei membri per natura
 MembersByRegion=Questa schermata mostra le statistiche dei membri per regione
 VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index 29832044bd0..1a960a4bdb0 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index a276b951293..a30432daf79 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -3,8 +3,6 @@ RefProject=Rif. progetto
 ProjectRef=Progetto rif.
 ProjectId=Id progetto
 ProjectLabel=Etichetta progetto
-Project=Progetto
-Projects=Progetti
 ProjectsArea=Sezione progetti
 ProjectStatus=Stato del progetto
 SharedProject=Progetto condiviso
@@ -38,6 +36,7 @@ OpenedTasks=Attività aperte
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Importo delle vendite potenziali per stato nei progetti
 ShowProject=Visualizza progetto
+ShowTask=Visualizza compito
 SetProject=Imposta progetto
 NoProject=Nessun progetto definito o assegnato
 NbOfProjects=Num. di progetti
@@ -77,6 +76,7 @@ Time=Tempo
 ListOfTasks=Elenco dei compiti
 GoToListOfTimeConsumed=Vai all'elenco del tempo impiegato
 GoToListOfTasks=Vai all'elenco dei compiti
+GanttView=Gantt View
 ListProposalsAssociatedProject=Elenco delle proposte commerciali associate al progetto
 ListOrdersAssociatedProject=Elenco degli ordini clienti associati al progetto
 ListInvoicesAssociatedProject=Elenco delle fatture attive associate al progetto
@@ -108,6 +108,7 @@ AlsoCloseAProject=Chiudu anche il progetto (mantienilo aperto se hai ancora biso
 ReOpenAProject=Apri progetto
 ConfirmReOpenAProject=Vuoi davvero riaprire il progetto?
 ProjectContact=Contatti del progetto
+TaskContact=Task contacts
 ActionsOnProject=Azioni sul progetto
 YouAreNotContactOfProject=Non sei tra i contatti di questo progetto privato
 UserIsNotContactOfProject=L'utente non è un contatto di questo progetto privato
@@ -115,7 +116,7 @@ DeleteATimeSpent=Cancella il tempo lavorato
 ConfirmDeleteATimeSpent=Vuoi davvero cancellare il tempo lavorato?
 DoNotShowMyTasksOnly=Mostra anche le attività non assegnate a me
 ShowMyTasksOnly=Mostra soltanto le attività assegnate a me
-TaskRessourceLinks=Risorse
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Progetti dedicati a questo soggetto terzo
 NoTasks=Nessun compito per questo progetto
 LinkedToAnotherCompany=Collegato ad un altro soggetto terzo
diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index 97d80db7f10..efb1b25610b 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=Attualmente il valore è solo un dato informativo e non viene usato per alcun calcolo automatico
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index b8369f2eef4..feb6446fe3e 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movimenti
 ErrorWarehouseRefRequired=Riferimento magazzino mancante
 ListOfWarehouses=Elenco magazzini
 ListOfStockMovements=Elenco movimenti delle scorte
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=Elenco dei movimenti delle scorte associati al progetto
 StocksArea=Area magazzino e scorte
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Il livello delle scorte deve essere sufficiente per
 StockMustBeEnoughForOrder=Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio all'ordine cliente (il controllo viene effettuato sulle scorte reali quando viene aggiunta una riga di ordine, qualsiasi sia la regola di gestione automatica)
 StockMustBeEnoughForShipment= Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio alla spedizione (il controllo viene effettuato sulle scorte reali quando viene aggiunta una riga di spedizione, qualsiasi sia la regola di gestione automatica)
 MovementLabel=Etichetta per lo spostamento di magazzino
+DateMovement=Date of movement
 InventoryCode=Codice di inventario o di spostamento
 IsInPackage=Contenuto nel pacchetto
 WarehouseAllowNegativeTransfer=Scorte possono essere negative
diff --git a/htdocs/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang
index a6ad18f24d0..71fe88fe0d3 100644
--- a/htdocs/langs/it_IT/trips.lang
+++ b/htdocs/langs/it_IT/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Nota spese
-ExpenseReports=Note spese
 ShowExpenseReport=Mostra note spese
 Trips=Note spese
 TripsAndExpenses=Note spese
@@ -12,6 +10,8 @@ ListOfFees=Elenco delle tariffe
 TypeFees=Tipi di imposte
 ShowTrip=Mostra note spese
 NewTrip=Nuova nota spese
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Tariffa kilometrica o importo
 DeleteTrip=Elimina nota spese
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Hai già inviata una nota spese per il periodo selezionato
 AucuneLigne=Non ci sono ancora note spese
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index 8e8996d0475..2f00ad3dfd5 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Cancella sito web
 ConfirmDeleteWebsite=Sei sicuro di vole cancellare questo sito web? Anche tutte le pagine e contenuti saranno cancellati.
 WEBSITE_PAGENAME=Titolo/alias della pagina
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=Indirizzo URL del file CSS esterno
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Modifica menu
 EditMedias=Edit medias
 EditPageMeta=Modifica metadati
-Website=Sito web
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index f3e15445c3f..091a4649c1d 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=自動検出（ブラウザの言語）
 FeatureDisabledInDemo=デモで機能を無効にする
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=パーミッション
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=から要素のみ<a href="%s">対応のモジュールが</a>表示されます。
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=あなたが複数の企業を管理することができます
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=示唆されたパスワードを生成したり、パ
 DisableForgetPasswordLinkOnLogonPage=ログインページのリンク &quot;パスワードを忘れた&quot;を表示しない
 UsersSetup=ユーザーモジュールのセットアップ
 UserMailRequired=新しいユーザーを作成するために必要な電子メール
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index 49355ddf7bb..c37f446d5e0 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=見通しの状態
 DraftPropals=ドラフト商業の提案
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 5d06071437d..05b19a78db4 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 9b9fa9cbbd0..692fc438db8 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=企業のユニークなコンタクト
 MailNoChangePossible=検証メール送信の受信者を変更することはできません
 SearchAMailing=Searchメーリング
 SendMailing=メール送信送信
-SendMail=メールを送る
 SentBy=によって送信され、
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=ただし、セッションで送信するメールの最大数の値を持つパラメータのMAILING_LIMIT_SENDBYWEBを追加することによってそれらをオンラインで送信することができます。このため、ホームに行く - セットアップ - その他を。
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 0719e7f90a6..e1090e99cd0 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=年
 DurationMonth=月
 DurationWeek=週
@@ -608,6 +610,7 @@ SendByMail=電子メールで送信
 MailSentBy=によって送信される電子メール
 TextUsedInTheMessageBody=電子メールの本文
 SendAcknowledgementByMail=Send confirmation email
+SendMail=メールを送る
 EMail=E-mail
 NoEMail=まだメールしない
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=ウェブサイト
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=イベント
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=プロジェクト
+Projects=プロジェクト
+Rights=パーミッション
 # Week day
 Monday=月曜日
 Tuesday=火曜日
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 739db17b33e..7f331fd6671 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=売上高（会社の場合）または予算（基礎用）
 DefaultAmount=サブスクリプションのデフォルトの量
 CanEditAmount=訪問者は、そのサブスクリプションの量を選択/編集することができます
 MEMBER_NEWFORM_PAYONLINE=統合されたオンライン決済のページにジャンプ
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 99c900f4ed3..5bcbd34f6a8 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=プロジェクト
-Projects=プロジェクト
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=皆
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=プロジェクトを表示する
+ShowTask=タスクを表示する
 SetProject=プロジェクトを設定します。
 NoProject=はプロジェクトが定義されていませんまたは所有している
 NbOfProjects=プロジェクトのNb
@@ -77,6 +76,7 @@ Time=時間
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=プロジェクトに関連付けられている商用の提案のリスト
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=開いているプロジェクト
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=プロジェクトの連絡先
+TaskContact=Task contacts
 ActionsOnProject=プロジェクトのイベント
 YouAreNotContactOfProject=この民間プロジェクトの接触ではありません
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=費やした時間を削除します。
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=資源
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=この第三者に専用のプロジェクト
 NoTasks=このプロジェクトのための作業をしない
 LinkedToAnotherCompany=他の第三者へのリンク
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 9ecf21e1a0d..a9716c82b4a 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -22,6 +22,7 @@ Movements=動作
 ErrorWarehouseRefRequired=ウェアハウスの参照名を指定する必要があります
 ListOfWarehouses=倉庫のリスト
 ListOfStockMovements=在庫変動のリスト
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index 04fbeaf2efa..27eeaf77c7f 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=手数料のリスト
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=量またはキロ
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index e72e8b28e89..79ac3614e42 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=ウェブサイトを削除
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=ウェブサイト
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 181274892a4..64b005c8278 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/ka_GE/commercial.lang b/htdocs/langs/ka_GE/commercial.lang
index deb66143b82..a832775b36c 100644
--- a/htdocs/langs/ka_GE/commercial.lang
+++ b/htdocs/langs/ka_GE/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ka_GE/holiday.lang b/htdocs/langs/ka_GE/holiday.lang
index 462515ca9a2..1c19d69732a 100644
--- a/htdocs/langs/ka_GE/holiday.lang
+++ b/htdocs/langs/ka_GE/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 9e5248aeced..27e041910bf 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 6236f580bf1..88afa53fb70 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index fb7cc76c50e..fd0adc4c264 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/ka_GE/modulebuilder.lang b/htdocs/langs/ka_GE/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/ka_GE/modulebuilder.lang
+++ b/htdocs/langs/ka_GE/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index d46076309b7..f2e57a1ff8f 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/ka_GE/salaries.lang b/htdocs/langs/ka_GE/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/ka_GE/salaries.lang
+++ b/htdocs/langs/ka_GE/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 81708ae01c4..aec0029e6c5 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/ka_GE/trips.lang b/htdocs/langs/ka_GE/trips.lang
index bf9fea30f68..a741a9f6e5f 100644
--- a/htdocs/langs/ka_GE/trips.lang
+++ b/htdocs/langs/ka_GE/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index 181274892a4..64b005c8278 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/km_KH/commercial.lang b/htdocs/langs/km_KH/commercial.lang
index deb66143b82..a832775b36c 100644
--- a/htdocs/langs/km_KH/commercial.lang
+++ b/htdocs/langs/km_KH/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/km_KH/holiday.lang b/htdocs/langs/km_KH/holiday.lang
index 462515ca9a2..1c19d69732a 100644
--- a/htdocs/langs/km_KH/holiday.lang
+++ b/htdocs/langs/km_KH/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
index 9e5248aeced..27e041910bf 100644
--- a/htdocs/langs/km_KH/mails.lang
+++ b/htdocs/langs/km_KH/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index 6ff65aab724..d1c0b8a6d70 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
index fb7cc76c50e..fd0adc4c264 100644
--- a/htdocs/langs/km_KH/members.lang
+++ b/htdocs/langs/km_KH/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/km_KH/modulebuilder.lang b/htdocs/langs/km_KH/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/km_KH/modulebuilder.lang
+++ b/htdocs/langs/km_KH/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index d46076309b7..f2e57a1ff8f 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/km_KH/salaries.lang b/htdocs/langs/km_KH/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/km_KH/salaries.lang
+++ b/htdocs/langs/km_KH/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index 81708ae01c4..aec0029e6c5 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/km_KH/trips.lang b/htdocs/langs/km_KH/trips.lang
index bf9fea30f68..a741a9f6e5f 100644
--- a/htdocs/langs/km_KH/trips.lang
+++ b/htdocs/langs/km_KH/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/km_KH/website.lang
+++ b/htdocs/langs/km_KH/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index ab002f6255c..a363b964205 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/kn_IN/commercial.lang b/htdocs/langs/kn_IN/commercial.lang
index fd403c0b80b..371f3846d34 100644
--- a/htdocs/langs/kn_IN/commercial.lang
+++ b/htdocs/langs/kn_IN/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=ನಿರೀಕ್ಷಿತರ ಸ್ಥಿತಿ
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/kn_IN/holiday.lang b/htdocs/langs/kn_IN/holiday.lang
index 462515ca9a2..1c19d69732a 100644
--- a/htdocs/langs/kn_IN/holiday.lang
+++ b/htdocs/langs/kn_IN/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 9e5248aeced..27e041910bf 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 0d9c51c6548..588ffc813d2 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index fb7cc76c50e..fd0adc4c264 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/kn_IN/modulebuilder.lang b/htdocs/langs/kn_IN/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/kn_IN/modulebuilder.lang
+++ b/htdocs/langs/kn_IN/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index d46076309b7..f2e57a1ff8f 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/kn_IN/salaries.lang b/htdocs/langs/kn_IN/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/kn_IN/salaries.lang
+++ b/htdocs/langs/kn_IN/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 81708ae01c4..aec0029e6c5 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/kn_IN/trips.lang b/htdocs/langs/kn_IN/trips.lang
index eea11bf1d1d..5c205a7d8fd 100644
--- a/htdocs/langs/kn_IN/trips.lang
+++ b/htdocs/langs/kn_IN/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 720d3e60c62..c5d28f7c002 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/ko_KR/commercial.lang b/htdocs/langs/ko_KR/commercial.lang
index 35804cd17a0..224644da53b 100644
--- a/htdocs/langs/ko_KR/commercial.lang
+++ b/htdocs/langs/ko_KR/commercial.lang
@@ -70,3 +70,9 @@ Stats=판매 통계
 StatusProsp=잠재 고객 상태
 DraftPropals=상업적 제안 초안
 NoLimit=제한 없음
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang
index c85e643fa85..96ffa4a8ebf 100644
--- a/htdocs/langs/ko_KR/holiday.lang
+++ b/htdocs/langs/ko_KR/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index d2825433e41..04fdf94b7f9 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index aa9fb444d9e..953a2afb9ae 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -266,8 +266,10 @@ DateApprove2=승인 날짜 (두 번째 승인)
 RegistrationDate=Registration date
 UserCreation=생성 사용자
 UserModification=수정 사용자
+UserValidation=Validation user
 UserCreationShort=생성 사용자
 UserModificationShort=수정 사용자
+UserValidationShort=Valid. user
 DurationYear=년
 DurationMonth=월
 DurationWeek=주
@@ -608,6 +610,7 @@ SendByMail=이메일로 보내기
 MailSentBy=보낸 이메일
 TextUsedInTheMessageBody=이메일 본문
 SendAcknowledgementByMail=확인 이메일 보내기
+SendMail=Send email
 EMail=이메일
 NoEMail=이메일 없음
 Email=이메일
@@ -808,6 +811,10 @@ ModuleBuilder=모듈 빌더
 SetMultiCurrencyCode=통화 설정
 BulkActions=벌크 작업
 ClickToShowHelp=툴팁 도움말을 보려면 클릭하십시오.
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=경비 보고서
 HR=HR
 HRAndBank=HR 및 은행
 AutomaticallyCalculated=자동 계산 됨
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=이벤트
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=프로젝트
+Rights=Permissions
 # Week day
 Monday=월요일
 Tuesday=화요일
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index 5a73e1b4e82..1647ac79994 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/ko_KR/modulebuilder.lang b/htdocs/langs/ko_KR/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/ko_KR/modulebuilder.lang
+++ b/htdocs/langs/ko_KR/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index a076f16eb77..5638fa48496 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=프로젝트
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=자원
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/ko_KR/salaries.lang b/htdocs/langs/ko_KR/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/ko_KR/salaries.lang
+++ b/htdocs/langs/ko_KR/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index c6c56936b20..3cad4d88383 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/ko_KR/trips.lang b/htdocs/langs/ko_KR/trips.lang
index 829eb6af211..bcd3b56f62c 100644
--- a/htdocs/langs/ko_KR/trips.lang
+++ b/htdocs/langs/ko_KR/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=경비 보고서
 ShowExpenseReport=Show expense report
 Trips=경비 보고서
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index 5b18fda3be0..04d6210876c 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index b760e2cb94f..d4ed4dcae90 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=ການອະນຸຍາດ
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/lo_LA/commercial.lang b/htdocs/langs/lo_LA/commercial.lang
index deb66143b82..a832775b36c 100644
--- a/htdocs/langs/lo_LA/commercial.lang
+++ b/htdocs/langs/lo_LA/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/lo_LA/holiday.lang b/htdocs/langs/lo_LA/holiday.lang
index c35d4c9ea62..01b9ed7d1e0 100644
--- a/htdocs/langs/lo_LA/holiday.lang
+++ b/htdocs/langs/lo_LA/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 9e5248aeced..27e041910bf 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 69a88a00b68..b4ba8095367 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=ການອະນຸຍາດ
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index 1116049ebc9..46ecfd9f153 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 7d9fbbbbbfa..07ed9848aa6 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/lo_LA/salaries.lang b/htdocs/langs/lo_LA/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/lo_LA/salaries.lang
+++ b/htdocs/langs/lo_LA/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 1feea8c712a..1bb076310cb 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/lo_LA/trips.lang b/htdocs/langs/lo_LA/trips.lang
index bf9fea30f68..a741a9f6e5f 100644
--- a/htdocs/langs/lo_LA/trips.lang
+++ b/htdocs/langs/lo_LA/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index a8445177ae8..3617751cf64 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Automatinis aptikimas (naršyklės kalba)
 FeatureDisabledInDemo=Funkcija išjungta demo versijoje
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Leidimai
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Rodomi tik elementai iš <a href="%s">leidžiami moduliai</a>.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Jums leidžiama valdyti kelias įmones
 Module6000Name=Darbo eiga
 Module6000Desc=Darbo eigos valdymas
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leidimų valdymas
 Module20000Desc=Darbuotojų leidimai
 Module39000Name=Prekių partija
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Paprastai generuoti pasiūlytus slaptažodžius arba p
 DisableForgetPasswordLinkOnLogonPage=Nerodyti pranešimo "Pamiršote slaptažodį ?" prisijungimo puslapyje
 UsersSetup=Vartotojų modulio nuostatos
 UserMailRequired=Naujo vartotojo sukūrimui reikalingas el. paštas
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/lt_LT/commercial.lang b/htdocs/langs/lt_LT/commercial.lang
index 99866670f0e..33763481bcf 100644
--- a/htdocs/langs/lt_LT/commercial.lang
+++ b/htdocs/langs/lt_LT/commercial.lang
@@ -70,3 +70,9 @@ Stats=Pardavimų statistika
 StatusProsp=Plano būklė
 DraftPropals=Komercinių pasiūlymų projektai
 NoLimit=Be apribojimų
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang
index 6c50e9b3d59..10dabe99509 100644
--- a/htdocs/langs/lt_LT/holiday.lang
+++ b/htdocs/langs/lt_LT/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 1f633005d7b..276661f8ae1 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unikalūs kontaktai/ adresai
 MailNoChangePossible=Patvirtintų e-laiškų gavėjai negali būti pakeisti
 SearchAMailing=E-pašto paieška
 SendMailing=Siųsti e-paštą
-SendMail=Siųsti e-laišką
 SentBy=Išsiųsta iš
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Galite siųsti jiems internetu pridedant parametrą MAILING_LIMIT_SENDBYWEB su maks. laiškų kiekio, norimų siųsti sesijos metu, reikšme. Tam eiti į Pagrindinis-Nustatymai-Kiti.
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 37f88ef9bf4..925b3a773b6 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Patvirtinimo data (antrasis patvirtinimas)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=metai
 DurationMonth=mėnuo
 DurationWeek=savaitė
@@ -608,6 +610,7 @@ SendByMail=Siųsti e-paštu
 MailSentBy=E-Laišką atsiuntė
 TextUsedInTheMessageBody=E-laiško pagrindinė dalis
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Siųsti e-laišką
 EMail=E-mail
 NoEMail=E-laiškų nėra
 Email=El. paštas
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Išlaidų ataskaita
+ExpenseReports=Išlaidų ataskaitos
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Įvykiai
 EMailTemplates=El.pašto pranešimų šablonai
 FileNotShared=File not shared to exernal public
+Project=Projektas
+Projects=Projektai
+Rights=Leidimai
 # Week day
 Monday=Pirmadienis
 Tuesday=Antradienis
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 62b4061afdd..8540a9b23b9 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Apyvarta (įmonės) arba Biudžeto (organizacijos)
 DefaultAmount=Pasirašymo apimtis (pagal nutylėjimą)
 CanEditAmount=Lankytojas gali pasirinkti/redaguoti savo pasirašymo apimtį
 MEMBER_NEWFORM_PAYONLINE=Peršokti į integruotą interneto mokėjimo puslapį
-ByProperties=Pagal savybes
-MembersStatisticsByProperties=Narių statistiniai duomenys pagal savybes
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Šis ekranas rodo Jums statistinius duomenis apie narius pagal jų tipą.
 MembersByRegion=Šis ekranas rodo Jums statistinius duomenis apie narius pagal regionus.
 VATToUseForSubscriptions=Pasirašymams naudojamas PVM tarifas
diff --git a/htdocs/langs/lt_LT/modulebuilder.lang b/htdocs/langs/lt_LT/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/lt_LT/modulebuilder.lang
+++ b/htdocs/langs/lt_LT/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index f075f8d9fd4..956c1e92341 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -3,8 +3,6 @@ RefProject=Projekto nuoroda
 ProjectRef=Project ref.
 ProjectId=Projekto ID
 ProjectLabel=Project label
-Project=Projektas
-Projects=Projektai
 ProjectsArea=Projects Area
 ProjectStatus=Projekto statusas
 SharedProject=Visi
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Rodyti projektą
+ShowTask=Rodyti užduotį
 SetProject=Nustatykite projektą
 NoProject=Nėra apibrėžto ar turimo projekto
 NbOfProjects=Projektų skaičius
@@ -77,6 +76,7 @@ Time=Laikas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Komercinių pasiūlymų, susijusių su projektu, sąrašas
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Atidaryti projektą
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekto kontaktai
+TaskContact=Task contacts
 ActionsOnProject=Projekto įvykiai
 YouAreNotContactOfProject=Jūs nesate šios privataus projekto kontaktinis adresatas
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Ištrinti praleistą laiką
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Taip pat žiūrėti užduotis pavestas ne man
 ShowMyTasksOnly=Rodyti tik man pavestas užduotis
-TaskRessourceLinks=Ištekliai
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projektai, skirti šiai trečiąjai šaliai
 NoTasks=Nėra uždavinių šiam projektui
 LinkedToAnotherCompany=Susijęs su kita trečiąja šalimi
diff --git a/htdocs/langs/lt_LT/salaries.lang b/htdocs/langs/lt_LT/salaries.lang
index 4062dd49cea..5bf1a7c97ec 100644
--- a/htdocs/langs/lt_LT/salaries.lang
+++ b/htdocs/langs/lt_LT/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 7599d566b0b..19865d0ed23 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -22,6 +22,7 @@ Movements=Judesiai
 ErrorWarehouseRefRequired=Sandėlio nuorodos pavadinimas yra būtinas
 ListOfWarehouses=Sandėlių sąrašas
 ListOfStockMovements=Atsargų judėjimų sąrašas
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Sandėlių plotas
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang
index 211d49c7be1..1490ee5f5e7 100644
--- a/htdocs/langs/lt_LT/trips.lang
+++ b/htdocs/langs/lt_LT/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Išlaidų ataskaita
-ExpenseReports=Išlaidų ataskaitos
 ShowExpenseReport=Rodyti išlaidų ataskaitą
 Trips=Išlaidų ataskaitos
 TripsAndExpenses=Išlaidų ataskaitos
@@ -12,6 +10,8 @@ ListOfFees=Įmokų sąrašas
 TypeFees=Types of fees
 ShowTrip=Rodyti išlaidų ataskaitą
 NewTrip=Nauja išlaidų ataskaita
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Suma arba Kilometrai
 DeleteTrip=Ištrinti išlaidų ataskaitą
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Jūs deklaravote kitą išlaidų ataskaitą panašiame laiko periode.
 AucuneLigne=Dar nėra deklaruotos išlaidų ataskaitos
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index 3beda46b0fe..5cc353802f4 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 602dfea3fd9..30ef9db4953 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignorēt dubulto ierakstu kļūdas (INSERT IGNORE)
 AutoDetectLang=Automātiski noteikt (pārlūka valoda)
 FeatureDisabledInDemo=Iespēja bloķēta demo versijā
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Atļaujas
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Tikai elementus no <a href="%s">iespējotu moduļi</a> tiek parādīts.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -259,8 +258,8 @@ FontSize=Fonta izmērs
 Content=Saturs
 NoticePeriod=Notice period
 NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
+Emails=E-pasti
+EMailsSetup=E-pastu iestatīšana
 EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
 EmailSenderProfiles=Emails sender profiles
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS Ports (Pēc noklusējuma php.ini: <b>%s)</b>
@@ -593,7 +592,7 @@ Module5000Desc=Ļauj jums pārvaldīt vairākus uzņēmumus
 Module6000Name=Darba plūsma
 Module6000Desc=Plūsmas vadība
 Module10000Name=Mājas lapas
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Tulkojumu konfigurēšana
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Noteikums, lai radītu piedāvātos paroles vai apstip
 DisableForgetPasswordLinkOnLogonPage=Nerādīt saiti "Aizmirsu paroli" pieteikšanās lapā
 UsersSetup=Lietotāju moduļa uzstādīšana
 UserMailRequired=E-pasts nepieciešams, lai izveidotu jaunu lietotāju
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/lv_LV/commercial.lang b/htdocs/langs/lv_LV/commercial.lang
index df518020808..6e77cfa504a 100644
--- a/htdocs/langs/lv_LV/commercial.lang
+++ b/htdocs/langs/lv_LV/commercial.lang
@@ -70,3 +70,9 @@ Stats=Tirdzniecības statistika
 StatusProsp=Prospekta statuss
 DraftPropals=Izstrādā komerciālos priekšlikumus
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index 70746810047..374b2d2107f 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Darbinieka uzvārds
 EmployeeFirstname=Darbinieka vārds
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 79bb10d9f20..3eb97867ec0 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unikālie kontakti/adreses
 MailNoChangePossible=Saņēmējiem par apstiprinātus pasta vēstuļu sūtīšanas nevar mainīt
 SearchAMailing=Meklēt e-pastu
 SendMailing=Nosūtīt e-pastu
-SendMail=Sūtīt e-pastu
 SentBy=Iesūtīja
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Taču jūs varat sūtīt tos tiešsaistē, pievienojot parametru MAILING_LIMIT_SENDBYWEB ar vērtību max skaitu e-pasta Jūs vēlaties nosūtīt pa sesiju. Lai to izdarītu, dodieties uz Home - Setup - pārējie.
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 230678832c5..7fa80c7d211 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Izveidot lietotāju
 UserModificationShort=Labot lietotāju
+UserValidationShort=Valid. user
 DurationYear=gads
 DurationMonth=mēnesis
 DurationWeek=nedēļa
@@ -608,6 +610,7 @@ SendByMail=Sūtīt pa e-pastu
 MailSentBy=Nosūtīts e-pasts ar
 TextUsedInTheMessageBody=E-pasts ķermeņa
 SendAcknowledgementByMail=Sūtīt apstiprinājuma e-pastu
+SendMail=Sūtīt e-pastu
 EMail=E-pasts
 NoEMail=Nav e-pasta
 Email=E-pasts
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Iestatīt valūtu
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Mājas lapa
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Izdevumu atskaites
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Pasākumi
 EMailTemplates=E-pastu paraugi
 FileNotShared=File not shared to exernal public
+Project=Projekts
+Projects=Projekti
+Rights=Atļaujas
 # Week day
 Monday=Pirmdiena
 Tuesday=Otrdiena
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index ddfa9eb820d..93c3b6b9979 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Apgrozījums (uzņēmumam) vai budžets (par pamatu)
 DefaultAmount=Default summa parakstīšanās
 CanEditAmount=Apmeklētājs var izvēlēties / rediģēt summu no tās parakstītā
 MEMBER_NEWFORM_PAYONLINE=Pārlēkt uz integrētu tiešsaistes maksājumu lapā
-ByProperties=Līdz raksturlielumu
-MembersStatisticsByProperties=Dalībnieku statistika pēc parametriem
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=PVN likme izmantot abonementu
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index dc9958d7a75..80ac737cec7 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 78d593e884b..55c13d99fe7 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Projekta ID
 ProjectLabel=Projekta nosaukums
-Project=Projekts
-Projects=Projekti
 ProjectsArea=Projektu sadaļa
 ProjectStatus=Project status
 SharedProject=Visi
@@ -38,6 +36,7 @@ OpenedTasks=Atvērtie uzdevumi
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Rādīt projektu
+ShowTask=Rādīt uzdevumu
 SetProject=Izvēlēties projektu
 NoProject=Neviens projekts nosaka, vai īpašumā
 NbOfProjects=Nb projektu
@@ -77,6 +76,7 @@ Time=Laiks
 ListOfTasks=Uzdevumu saraksts
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Saraksts tirdzniecības priekšlikumiem saistībā ar projektu
 ListOrdersAssociatedProject=Saraksts ar klienta pasūtījumiem saistīts ar projektu
 ListInvoicesAssociatedProject=Saraksts ar klienta rēķiniem, kas piesaistīti projektam
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Atvērt projektu
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekta kontakti
+TaskContact=Task contacts
 ActionsOnProject=Pasākumi par projektu
 YouAreNotContactOfProject=Jūs neesat kontakts šīs privātam projektam
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Dzēst pavadīts laiks
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resursi
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekti, kas veltīta šai trešajai personai
 NoTasks=Neviens uzdevumi šajā projektā
 LinkedToAnotherCompany=Saistīts ar citām trešajām personām
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index e8a29f994c2..a508d47aae2 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -13,3 +13,5 @@ TJM=Vidējā dienas likme
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 13bb4275302..bdb9603b4c4 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -22,6 +22,7 @@ Movements=Kustības
 ErrorWarehouseRefRequired=Noliktava nosaukums ir obligāts
 ListOfWarehouses=Saraksts noliktavās
 ListOfStockMovements=Krājumu pārvietošanas saraksts
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Noliktavas platība
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
index 60f3ecdb7ee..e48e082f2a4 100644
--- a/htdocs/langs/lv_LV/trips.lang
+++ b/htdocs/langs/lv_LV/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Saraksts maksu
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Summa vai kilometri
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 6cbfd313f11..7677c9a30d2 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Dzēst mājaslapu
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Lapas nosaukums / pseidonīms
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Labot izvēlni
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Mājas lapa
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Pievienot lapu / konteineru
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index bca39d6ee7b..c59f15e08f9 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/mk_MK/commercial.lang b/htdocs/langs/mk_MK/commercial.lang
index deb66143b82..a832775b36c 100644
--- a/htdocs/langs/mk_MK/commercial.lang
+++ b/htdocs/langs/mk_MK/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang
index 462515ca9a2..1c19d69732a 100644
--- a/htdocs/langs/mk_MK/holiday.lang
+++ b/htdocs/langs/mk_MK/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 9e5248aeced..27e041910bf 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 42119f380a4..6face15a874 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index fb7cc76c50e..fd0adc4c264 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/mk_MK/modulebuilder.lang b/htdocs/langs/mk_MK/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/mk_MK/modulebuilder.lang
+++ b/htdocs/langs/mk_MK/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index d46076309b7..f2e57a1ff8f 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang
index ed296e3905f..65bf2263d07 100644
--- a/htdocs/langs/mk_MK/salaries.lang
+++ b/htdocs/langs/mk_MK/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 81708ae01c4..aec0029e6c5 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/mk_MK/trips.lang b/htdocs/langs/mk_MK/trips.lang
index bf9fea30f68..a741a9f6e5f 100644
--- a/htdocs/langs/mk_MK/trips.lang
+++ b/htdocs/langs/mk_MK/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 181274892a4..64b005c8278 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/mn_MN/commercial.lang b/htdocs/langs/mn_MN/commercial.lang
index deb66143b82..a832775b36c 100644
--- a/htdocs/langs/mn_MN/commercial.lang
+++ b/htdocs/langs/mn_MN/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/mn_MN/holiday.lang b/htdocs/langs/mn_MN/holiday.lang
index 462515ca9a2..1c19d69732a 100644
--- a/htdocs/langs/mn_MN/holiday.lang
+++ b/htdocs/langs/mn_MN/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index 9e5248aeced..27e041910bf 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 37ec81c9bf7..cac683bef06 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index fb7cc76c50e..fd0adc4c264 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/mn_MN/modulebuilder.lang b/htdocs/langs/mn_MN/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/mn_MN/modulebuilder.lang
+++ b/htdocs/langs/mn_MN/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index d46076309b7..f2e57a1ff8f 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/mn_MN/salaries.lang b/htdocs/langs/mn_MN/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/mn_MN/salaries.lang
+++ b/htdocs/langs/mn_MN/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 81708ae01c4..aec0029e6c5 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/mn_MN/trips.lang b/htdocs/langs/mn_MN/trips.lang
index bf9fea30f68..a741a9f6e5f 100644
--- a/htdocs/langs/mn_MN/trips.lang
+++ b/htdocs/langs/mn_MN/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 40d6219b51e..f0b4f015954 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -149,7 +149,7 @@ Docdate=Dato
 Docref=Referanse
 Code_tiers=Tredjepart
 LabelAccount=Kontoetikett
-LabelOperation=Label operation
+LabelOperation=Etikettoperasjon
 Sens=som betyr
 Codejournal=Journal
 NumPiece=Del nummer
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 1daaba9cf79..dcac7f74544 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignorer feil ved postduplisering (INSERT IGNORE)
 AutoDetectLang=Auto-oppdag (nettleserspråk)
 FeatureDisabledInDemo=Funksjonen er slått av i demo
 FeatureAvailableOnlyOnStable=Egenskapen er kun tilgjengelig på offisielle, stabile versjoner
-Rights=Tillatelser
 BoxesDesc=Widgeter er komponenter som viser litt informasjon som du kan legge til for å tilpasse enkelte sider. Du kan velge mellom å vise widgeten eller ikke ved å velge målside og klikke på 'Aktiver', eller ved å klikke på søppelkassen for å deaktivere den.
 OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises.
 ModulesDesc=Dolibarr-moduler definerer hvilken applikasjon/funksjon som er aktivert i programvaren. Enkelte applikasjoner/moduler krever tillatelser du må gi til brukere, etter at du har aktivert dem. Klikk på knappen på/av for å aktivere en modul/applikasjon.
@@ -262,15 +261,15 @@ NewByMonth=Ny etter måned
 Emails=Epost
 EMailsSetup=Oppsett av e-post
 EMailsDesc=Denne siden lar deg overskrive PHP-parametrene for sending av e-post. I de fleste tilfeller på Unix/Linux OS er PHP-oppsettet ditt riktig og disse parameterne er ubrukelige.
-EmailSenderProfiles=Emails sender profiles
+EmailSenderProfiles=E-postsender-profiler
 MAIN_MAIL_SMTP_PORT=SMTP-port (Standard i php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP-server (Standard i php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP-port (Settes ikke i PHP på Unix/Linux)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-server (Settes ikke i PHP på Unix/Linux)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_EMAIL_FROM=Avsender-e-post for automatiske e-poster (Som standard i php.ini: <b> %s</b>)
+MAIN_MAIL_ERRORS_TO=Avsender e-post brukes til returnert e-post
 MAIN_MAIL_AUTOCOPY_TO= Send systematisk en skjult karbon-kopi av alle sendte e-post til
-MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_DISABLE_ALL_MAILS=Deaktiver alle e-postmeldinger (for testformål eller demoer)
 MAIN_MAIL_SENDMODE=Metode for å sende e-post
 MAIN_MAIL_SMTPS_ID=SMTP-ID hvis godkjenning kreves
 MAIN_MAIL_SMTPS_PW=SMTP-passord hvis godkjenning kreves
@@ -279,7 +278,7 @@ MAIN_MAIL_EMAIL_STARTTLS= Bruk TLS (STARTTL) kryptering
 MAIN_DISABLE_ALL_SMS=Deaktiver alle SMS sendings (for testformål eller demoer)
 MAIN_SMS_SENDMODE=Metode for å sende SMS
 MAIN_MAIL_SMS_FROM=Standard avsender telefonnummer for sending av SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender email by default for manual sendings (User email or Company email)
+MAIN_MAIL_DEFAULT_FROMTYPE=Standard sender e-post som for manuelle sendinger (bruker e-post eller firmanavn)
 UserEmail=Bruker-epost
 CompanyEmail=Firma-epost
 FeatureNotAvailableOnLinux=Funksjonen er ikke tilgjengelig på Unix/Linux. Test sendmail lokalt.
@@ -373,7 +372,7 @@ PDFDesc=Du kan angi globale alternativer relatert til PDF-generering
 PDFAddressForging=Regler for å lage adressebokser
 HideAnyVATInformationOnPDF=Skjul alle opplysninger knyttet til MVA på genererte PDF-filer
 PDFLocaltax=Regler for %s
-HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
+HideLocalTaxOnPDF=Skjul %s rente i pdf kolonne 
 HideDescOnPDF=Skjul varebeskrivelse på generert PDF
 HideRefOnPDF=Skjul varereferanse på generert PDF
 HideDetailsOnPDF=Skjul linjer med varedetaljer på genererte PDF
@@ -409,11 +408,11 @@ ExtrafieldCheckBoxFromList=Avkrysningsbokser fra tabell
 ExtrafieldLink=Lenke til et objekt
 ComputedFormula=Beregnet felt
 ComputedFormulaDesc=Her kan du skrive inn en formel ved hjelp av andre objektegenskaper eller PHP-koding for å få en dynamisk beregningnet verdi. Du kan bruke PHP-kompatible formler, inkludert "?" operator og følgende globale objekt: <strong> $db, $conf, $langs, $mysoc, $user, $objekt </strong>. <br><br><Strong> ADVARSEL </strong>: Kanskje bare noen egenskaper på $objekt er tilgjengelig. Hvis du trenger egenskaper som ikke er lastet, kan du bare hente objektet i formelen din som i det andre eksempelet. <br> Ved å bruke et beregnet felt betyr det at du ikke selv kan angi noen verdi fra grensesnittet. Også, hvis det er en syntaksfeil, kan det hende formelen ikke returnerer noe. <br> <br> Eksempel på formel: <br> $objekt->id<10? round ($object->id / 2, 2) : ($object-> id + 2 *$user->id) * (int) substr($mysoc->zip, 1, 2) <br> <br> Eksempel på å ny innlasting av objekt <br> (($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch($obj-> id? $ obj-> id: ($obj-> rowid? $obj-> rowid: $object-> id))> 0))? $reloadedobj-> array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br> <br> Annet eksempel på formel for å tvinge lasting av objekt og dets overordnede objekt: <br> (($reloadedobj = Ny oppgave ($db)) && ($reloadedobj->fetch($objekt->id)> 0) && ($secondloadedobj = nytt prosjekt ($db)) && ($secondloadedobj->fetch($reloadedobj-> fk_project )> 0))? $secondloadedobj-> ref: 'Foreldreprosjekt ikke funnet'
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpselect=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1<br>2,verdi2<br>kode3,verdi3<br>...<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>1,verdi1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>: parent_key<br><br>For å få listen avhengig av en annen liste:<br>1,verdi1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code </i>: parent_key
+ExtrafieldParamHelpcheckbox=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
+ExtrafieldParamHelpradio=Liste over verdier må være linjer med formatet nøkkel,verdi (hvor nøkkelen ikke kan være '0')<br><br>for eksempel:<br>1,verdi1 <br>2,verdi2<br>3,verdi3<br> ...
+ExtrafieldParamHelpsellist=Liste over verdier kommer fra en tabell<br>Syntaks: tabellnavn: label_field: id_field::filter<br> Eksempel: c_typent: libelle:id::filter<br><br>- idfilter er nødvendigvis en primær int nøkkel<br>- filteret kan være en enkel test (f.eks. aktiv = 1) for å vise bare aktiv verdi <br> Du kan også bruke $ID$ i filtre, som er gjeldende ID for nåværende objekt <br> For å utføre en SELECT i filtre, bruk $SEL$<br> Hvis du vil filtrere på ekstrafelt, bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste: <br>c_typent:libelle:id:options_<i>parent_list_code</i> | parent_column:filter <br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code </i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Liste over verdier kommer fra en tabell <br> Syntaks: table_name:label_field:id_field::filter <br> Eksempel: c_typent:libelle:id::filter<br><br> filter kan være en enkel test (f.eks. Aktiv=1 ) for å vise bare aktiv verdi<br>Du kan også bruke $ID$ i filter, som er gjeldende ID for nåværende objekt<br>For å utføre en SELECT i filter, bruk $SEL$<br>Hvis du vil filtrere på ekstrafeltbruk bruk syntaks extra.fieldcode=... (der feltkoden er koden til ekstrafelt)<br><br>For å få listen avhengig av en annen komplementær attributtliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i> |parent_column:filter<br><br>For å få listen avhengig av en annen liste:<br>c_typent:libelle:id:<i>parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelplink=Parametre må være ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Eksempel : Societe:societe/class/societe.class.php
 LibraryToBuildPDF=Bibliotek brukt for PDF-generering
 WarningUsingFPDF=Advarsel! <b>conf.php</b> inneholder direktivet <b>dolibarr_pdf_force_fpdf=1</b>. Dette betyr at du bruker FPDF biblioteket for å generere PDF-filer. Dette biblioteket er gammelt og støtter ikke en rekke funksjoner (Unicode, bilde-transparens, kyrillisk, arabiske og asiatiske språk, ...), så du kan oppleve feil under PDF generering. <br> For å løse dette, og ha full støtte ved PDF generering, kan du laste ned <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, deretter kommentere eller fjerne linjen <b>$dolibarr_pdf_force_fpdf=1</b>, og i stedet legge inn <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
@@ -442,7 +441,7 @@ DisplayCompanyInfo=Vis firmaadresse
 DisplayCompanyManagers=Vis ledernavn
 DisplayCompanyInfoAndManagers=Vis firmaadresser og ledernavn
 EnableAndSetupModuleCron=Hvis du ønsker at gjentakende fakturaer skal genereres automatisk, må modulen *%s* være aktivert og riktig konfigurert. Ellers må generering av fakturaer gjøres manuelt fra denne malen med knapp *Lag*. Merk at selv om du har aktivert automatisk generering, kan du likevel trygt starte manuell generasjon. Generering av duplikater for samme periode er ikke mulig.
-ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
+ModuleCompanyCodeAquarium=Returner en regnskapskode som er bygd opp av: <br> %s etterfulgt av leverandørkode fra tredjepart for en leverandør-regnskapskode, <br> %s etterfulgt av tredjeparts kundekode for en kunde-regnskapskode.
 ModuleCompanyCodePanicum=Returner en tom regnskapskode.
 ModuleCompanyCodeDigitaria=Regnskapskode avhenger av tredjepartskode. Koden består av tegnet "C" i den første stillingen etterfulgt av de første 5 tegnene til tredjepartskoden.
 Use3StepsApproval=Som standard må innkjøpsordrer opprettes og godkjennes av 2 forskjellige brukere (ett trinn/bruker for å opprette og ett trinn/bruker for å godkjenne. Merk at hvis brukeren har både tillatelse til å opprette og godkjenne, vil ett trinn/ bruker vil være nok). Du kan bruke dette alternativet for å innføre et tredje trinn/bruker godkjenning, hvis beløpet er høyere enn en spesifisert verdi (så vil 3 trinn være nødvendig: 1=validering, 2=første godkjenning og 3=andre godkjenning dersom beløpet er høyt nok). <br> Sett denne tom en godkjenning (2 trinn) er nok, sett den til en svært lav verdi (0,1) hvis det alltid kreves en andre godkjenning (3 trinn).
@@ -453,8 +452,8 @@ DependsOn=Denne modulen trenger modulen(ene)
 RequiredBy=Denne modulen er påkrevd av modul(ene)
 TheKeyIsTheNameOfHtmlField=Dette er navnet på HTML-feltet. Dette må ha tekniske egenskaper for å lese innholdet på HTML-siden for å få nøkkelnavnet til et felt.
 PageUrlForDefaultValues=Du må skrive inn den relative nettadressen til siden. Hvis du inkluderer parametere i URL, vil standardverdiene være effektive hvis alle parametere er satt til samme verdi. Eksempler:
-PageUrlForDefaultValuesCreate=<br>For form to create a new thirdparty, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>For page that list thirdparties, it is <strong>%s</strong>,<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
+PageUrlForDefaultValuesCreate=<br> For skjema for å lage en ny tredjepart, er det <strong> %s</strong>, <br> Hvis du bare vil ha standardverdi hvis url har noen parameter, kan du bruke <strong>%s</strong>
+PageUrlForDefaultValuesList=<br> For side som viser tredjeparter, er det <strong>%s</strong>,<br>Hvis du bare vil ha standardverdi hvis url har noen parametre, kan du bruke<strong>%s</strong>
 EnableDefaultValues=Aktiver bruk av personlige standardverdier
 EnableOverwriteTranslation=Aktiver bruk av overskrivende oversettelse
 GoIntoTranslationMenuToChangeThis=En oversettelse har blitt funnet for nøkkelen med denne koden, så for å endre denne verdien må du redigere den fra Home-Setup-Oversettelse.
@@ -463,8 +462,8 @@ Field=Felt
 ProductDocumentTemplates=Dokumentmaler for å generere produktdokument
 FreeLegalTextOnExpenseReports=Fri juridisk tekst på utgiftsrapporter
 WatermarkOnDraftExpenseReports=Vannmerke på utgiftsrapport-maler
-AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
+AttachMainDocByDefault=Sett dette til 1 hvis du vil legge ved hoveddokumentet til e-post som standard (hvis aktuelt)
+FilesAttachedToEmail=Legg ved fil
 # Modules
 Module0Name=Brukere & grupper
 Module0Desc=Håndtering av Brukere/Ansatte og Grupper
@@ -587,13 +586,13 @@ Module3100Desc=Legg til en Skype-knapp i brukere/tredjeparter/kontakter/medlemsk
 Module3200Name=Ikke reversible logger
 Module3200Desc=Aktiver logg av enkelte forretningshendelser i en ikke reversibel logg. Hendelser arkiveres i sanntid. Loggen er en tabell med kjedede hendelser som kan leses og eksporteres. Denne modulen kan være obligatorisk for enkelte land.
 Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Desc=HRM (håndtering av avdeling, arbeidskontrakter og personell)
 Module5000Name=Multi-selskap
 Module5000Desc=Lar deg administrere flere selskaper
 Module6000Name=Arbeidsflyt
 Module6000Desc=Behandling av arbeidsflyt
 Module10000Name=Websider
-Module10000Desc=Opprett offentlige websider med en WYSIWYG-redigerer. Sett webserveren din til å peke mot mappen for å vise innholdet på internett
+Module10000Desc=Opprett offentlige nettsteder med en WYSIWG-editor. Bare sett opp webserveren din (Apache, Nginx, ...) for å peke mot den dedikerte Dolibarr-katalogen for å få den online på Internett med ditt eget domenenavn.
 Module20000Name=Administrasjon av ferieforespørsler
 Module20000Desc=Oppfølging av ansattes ferieforespørsler
 Module39000Name=Vare LOT
@@ -1092,11 +1091,11 @@ ShowProfIdInAddress=Vis Profesjonell ID med adresser på dokumenter
 ShowVATIntaInAddress=Skjul MVA Intra num med adresser på dokumenter
 TranslationUncomplete=Delvis oversettelse
 MAIN_DISABLE_METEO=Deaktiver Meteo visning
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
+MeteoStdMod=Standardmodus
+MeteoStdModEnabled=Standard modus aktivert
+MeteoPercentageMod=Prosentmodus
+MeteoPercentageModEnabled=Prosentmodus aktivert
+MeteoUseMod=Klikk for å bruke %s
 TestLoginToAPI=Test-innlogging til API
 ProxyDesc=Enkelte funksjoner i Dolibarr må ha en Internett-tilgang for å fungere. Definer parametere for dette her. Hvis Dolibarr-serveren er bak en proxy-server, forteller disse parametrene Dolibarr hvordan få tilgang til Internett gjennom den.
 ExternalAccess=Ekstern tilgang
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Funksjonen for å sende e-post ved hjelp av metod
 TranslationSetup=Oppsett av oversettelse
 TranslationKeySearch=Søk etter oversettelsesnøkkel eller -streng
 TranslationOverwriteKey=Overskriv oversettelse
-TranslationDesc=Hvordan sette visningsspråk:<br>*Hele systemet: meny <strong>Hjem - Oppsett - Visning</strong><br>*Pr. bruker:<strong>Visning for bruker</strong>Fane for brukerkort (Klikk på brukernavn i toppen av skjermen).
+TranslationDesc=Slik angir du det viste applikasjonsspråket: <br> * Systemwide: Meny <strong> Hjem - Oppsett - Skjerm </strong> <br> * Per bruker: Bruk <strong> Brukeroppsettoppsett </strong> -fanen på brukerkortet ( klikk på brukernavnet øverst på skjermen).
 TranslationOverwriteDesc=Du kan også overstyre strenger ved å fylle ut tabellen nedenfor. Velg språk fra "%s" nedtrekkslisten, sett inn oversettelsesstrengen i "%s" og din nye oversettelse i "%s"
 TranslationOverwriteDesc2=Du kan bruke den andre fanen for å finne rett oversettelsesnøkkel
 TranslationString=Oversettelsesstreng
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Regel for å lage passord
 DisableForgetPasswordLinkOnLogonPage=Ikke vis lenken "Glemt passord" på innloggingssiden
 UsersSetup=Oppsett av brukermodulen
 UserMailRequired=E-postadresse kreves for å opprette en ny bruker
-DefaultCategoryCar=Standard bilkategori
-DefaultRangeNumber=Standard område nummer
 ##### HRM setup #####
 HRMSetup=Oppsett av HRM-modul
 ##### Company setup #####
@@ -1271,7 +1268,7 @@ LDAPSynchronizeUsers=Synkroniser Dolibarr brukere med LDAP
 LDAPSynchronizeGroups=Synkroniser Dolibarr grupper med LDAP
 LDAPSynchronizeContacts=Synkroniser Dolibarr kontakter med LDAP
 LDAPSynchronizeMembers=Organiser medlemmer i LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=Organisering av bedriftens medlemstyper i LDAP
 LDAPPrimaryServer=Primærserver
 LDAPSecondaryServer=Secondary server
 LDAPServerPort=Server port
@@ -1295,7 +1292,7 @@ LDAPDnContactActive=Synkronisering av kontakter
 LDAPDnContactActiveExample=Aktivert/Ikke aktivert synkronisering
 LDAPDnMemberActive=Synkronisering av medlemmer
 LDAPDnMemberActiveExample=Aktivert/Ikke aktivert synkronisering
-LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActive=Medlemstyper synkronisering
 LDAPDnMemberTypeActiveExample=Aktivert/Ikke aktivert synkronisering
 LDAPContactDn=Dolibarr-kontakters DN
 LDAPContactDnExample=Komplett DN (eks: ou=kontakter,dc=eksempel,dc=com)
@@ -1303,8 +1300,8 @@ LDAPMemberDn=Dolibarr-medlemmers DN
 LDAPMemberDnExample=Komplett DN (eks: ou=medlemmer,dc=eksempel,dc=com)
 LDAPMemberObjectClassList=Liste over objectClass
 LDAPMemberObjectClassListExample=Liste over objectClass som definerer postattributter (eks: topp, inetOrgPerson eller topp, bruker for ActiveDirectory)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeDn=Dolibarr medlemmer DN-typer 
+LDAPMemberTypepDnExample=Komplett DN (eks: ou=medlemstyper, dc=eksempel, dc=com)
 LDAPMemberTypeObjectClassList=Liste over objectClass
 LDAPMemberTypeObjectClassListExample=Liste over objectClass som definerer postattributter (eks: topp, groupOfUniqueNames)
 LDAPUserObjectClassList=Liste over objectClass
@@ -1318,7 +1315,7 @@ LDAPTestSynchroContact=Test kontaktsynkronisering
 LDAPTestSynchroUser=Test brukersynkronisering
 LDAPTestSynchroGroup=Test gruppesynkronisering
 LDAPTestSynchroMember=Test medlemsynkronisering
-LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSynchroMemberType=Test synkronisering av medlemstype
 LDAPTestSearch= Test et LDAP søk
 LDAPSynchroOK=Vellykket synkroniseringstest
 LDAPSynchroKO=Sykroniseringstesten feilet
@@ -1384,7 +1381,7 @@ LDAPDescContact=Denne siden lar deg definere LDAP-attributtnavn i LDAP-tre for a
 LDAPDescUsers=Denne siden lar deg definere LDAP-attributtnavn i LDAP-tre for alle data funnet på Dolibarr brukere.
 LDAPDescGroups=Denne siden lar deg definere LDAP-attributtnavn i LDAP-tre for alle data funnet på Dolibarr grupper.
 LDAPDescMembers=Denne siden lar deg definere LDAP-attributtnavn i LDAP-tre for alle data funnet på Dolibarr medlemmer.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescMembersTypes=Denne siden lar deg definere LDAP attributtnavn i LDAP-tre for hver data som finnes på Dolibarr-medlemstyper.
 LDAPDescValues=Eksempelverdier er designet for <b>OpenLDAP</b> med følgende lastede skjemaer: <b> core.schema, cosine.schema, inetorgperson.schema</b>). Hvis du bruker disse verdiene og OpenLDAP, endre LDAP configfilen <b> slapd.conf </b> for å ha alle disse skjemaene lastet.
 ForANonAnonymousAccess=For autentisert tilgang (f.eks skrivetilgang)
 PerfDolibarr=Ytelse oppsett/optimaliseringsrapport
@@ -1408,7 +1405,7 @@ CompressionOfResources=Undertrykkelse av HTTP-respons
 CompressionOfResourcesDesc=For eksempel ved bruk av Apache-direktivet "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=En slik automatisk deteksjon er ikke mulig med nåværende nettlesere
 DefaultValuesDesc=Her kan du definere/tvinge standardverdien du vil ha når du oppretter en ny post, og/eller standardfiltre eller sorteringsrekkefølge når du lister poster.
-DefaultCreateForm=Default values for creation form
+DefaultCreateForm=Standardverdier for skjemaoppretting
 DefaultSearchFilters=Standard søkefiltre
 DefaultSortOrder=Standard sorteringsorden
 DefaultFocus=Standard fokusfelt
@@ -1628,7 +1625,7 @@ ProjectsSetup=Oppsett av  Prosjektmodulen
 ProjectsModelModule=Dokumentmodell for prosjektrapporter
 TasksNumberingModules=Modul for oppgavenummerering
 TaskModelModule=Dokumentmal for oppgaverapporter
-UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient)
+UseSearchToSelectProject=Vent med å trykke på en tast når du laster inn innholdet i prosjekt-kombinasjonslisten (Dette kan øke ytelsen hvis du har et stort antall prosjekter, men det er mindre praktisk)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Regnskapsperioder
@@ -1689,7 +1686,7 @@ UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer
 ColorFormat=RGB-fargen er i HEX-format, for eksempel: FF0000
 PositionIntoComboList=Plassering av linje i kombinasjonslister
 SellTaxRate=Salgs-skattesats
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
+RecuperableOnly=Ja for MVA"Ikke oppfattet, men gjenopprettelig" dedikert til noen steder i Frankrike. Hold verdien til "Nei" i alle andre tilfeller.
 UrlTrackingDesc=Hvis leverandøren eller transporttjenesten tilbyr en side eller et nettsted for å sjekke status på din forsendelse, kan du skrive det her. Du kan bruke tasten {TRACKID} for å sette inn sporingnummer på webstedet.
 OpportunityPercent=Når du oppretter en mulighet, vil du estimere et visst beløp for prosjekt. Ifølge status på muligheter, kan dette beløpet multipliseres med denne raten for å finne global verdi alle dine muligheter kan generere. Verdien er en prosentverdi (mellom 0 og 100).
 TemplateForElement=Mal dedikert til element
@@ -1712,8 +1709,8 @@ MailToSendSupplierOrder=For å sende leverandørordre
 MailToSendSupplierInvoice=For å sende leverandørfaktura
 MailToSendContract=For å sende en kontrakt
 MailToThirdparty=For å sende epost fra tredjepart-side
-MailToMember=To send email from member page
-MailToUser=To send email from user page
+MailToMember=For å sende e-post fra medlemsside
+MailToUser=For å sende e-post fra brukerside
 ByDefaultInList=Vis som standard for liste
 YouUseLastStableVersion=Du bruker siste stabile versjon
 TitleExampleForMajorRelease=Eksempel på melding du kan bruke for å annonsere større oppdateringer (du kan bruke denne på dine websider)
@@ -1724,7 +1721,7 @@ MultiPriceRuleDesc=Når alternativet "Flere prisnivået per vare/tjeneste" er p
 ModelModulesProduct=Maler for produkt-dokumenter
 ToGenerateCodeDefineAutomaticRuleFirst=For å være i stand til å generere automatiske koder, må du først definere program for å automatisk definere strekkodenummer.
 SeeSubstitutionVars=Relaterte gjentakende fakturaer
-SeeChangeLog=See ChangeLog file (english only)
+SeeChangeLog=Se Endringslogg-fil (kun på engelsk)
 AllPublishers=Alle utgivere
 UnknownPublishers=Ukjente utgivere
 AddRemoveTabs=Legg til eller fjerne faner
@@ -1756,10 +1753,10 @@ BaseCurrency=Referansevaluta for selskapet (gå inn i oppsett av firma for å en
 WarningNoteModuleInvoiceForFrenchLaw=Denne modulen %s er i samsvar med franske lover (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Denne modulen %s er i samsvar med franske lover (Loi Finance 2016) fordi modulen Ikke reversible logger er automatisk aktivert.
 WarningInstallationMayBecomeNotCompliantWithLaw=Du prøver å installere modulen %s som er en ekstern modul. Aktivering av en ekstern modul betyr at du stoler på utgiveren av modulen, og at du er sikker på at denne modulen ikke endrer oppførselen til applikasjonen din negativt, og er i overensstemmelse med lovene i ditt land (%s). Hvis modulen gir en ulovlig funksjon, blir du ansvarlig for bruken av en ulovlig programvare.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_PDF_MARGIN_LEFT=Venstremarg på PDF
+MAIN_PDF_MARGIN_RIGHT=Høyremarg på PDF
+MAIN_PDF_MARGIN_TOP=Toppmarg på PDF
+MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
 ##### Resource ####
 ResourceSetup=Oppsett av Ressursmodulen
 UseSearchToSelectResource=Bruk et søkeskjema for å velge en ressurs (i stedet for en nedtrekksliste).
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 7c58b1fa359..c5773cb4a7c 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -12,7 +12,7 @@ Event=Hendelse
 Events=Hendelser
 EventsNb=Antall hendelser
 ListOfActions=Oversikt over hendelser
-EventReports=Event reports
+EventReports=Hendelsesrapporter
 Location=Lokasjon
 ToUserOfGroup=Til tilfeldig bruker i gruppe
 EventOnFullDay=Hendelse over hele dagen(e)
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index d8324fd4d18..3a775219323 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -158,5 +158,5 @@ VariousPayment=Diverse utbetalinger
 VariousPayments=Diverse utbetalinger
 ShowVariousPayment=Vis diverse betalinger
 AddVariousPayment=Legg til Diverse betalinger
-YourSEPAMandate=Your SEPA mandate
-FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to
+YourSEPAMandate=Ditt SEPA-mandat
+FindYourSEPAMandate=Dette er ditt SEPA-mandat for å autorisere vårt firma til å gjøre debitering til din bank. Send det i retur signert (skanning av det signerte dokumentet og send det via post) til
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index f0d2df09345..f97bf5e72c8 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -337,7 +337,7 @@ NextDateToExecution=Dato for neste fakturagenerering
 DateLastGeneration=Dato for siste generering
 MaxPeriodNumber=Maks ant for fakturagenerering
 NbOfGenerationDone=Ant. fakturaer som allerede er generert
-NbOfGenerationDoneShort=Nb of generation done
+NbOfGenerationDoneShort=Antall genereringer utført
 MaxGenerationReached=Maksimum antall genereringer nådd
 InvoiceAutoValidate=Valider fakturaer automatisk
 GeneratedFromRecurringInvoice=Generert fra gjentagende-fakturamal %s
diff --git a/htdocs/langs/nb_NO/commercial.lang b/htdocs/langs/nb_NO/commercial.lang
index f9adec632f4..3069e0ba830 100644
--- a/htdocs/langs/nb_NO/commercial.lang
+++ b/htdocs/langs/nb_NO/commercial.lang
@@ -70,3 +70,9 @@ Stats=Salgsstatistikk
 StatusProsp=Prospect status
 DraftPropals=Utkast kommersielle tilbud
 NoLimit=Ingen grense
+ToOfferALinkForOnlineSignature=Link for online signatur
+WelcomeOnOnlineSignaturePage=Velkommen til siden for å godta tilbud %s
+ThisScreenAllowsYouToSignDocFrom=Denne siden lar deg godta og signere eller avvise et tilbud
+ThisIsInformationOnDocumentToSign=Dette er informasjon på dokumentet for å godta eller avvise
+SignatureProposalRef=Underskrift av tilbud %s
+FeatureOnlineSignDisabled=Funksjon for online signering deaktivert eller dokument generert før funksjonen ble aktivert
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index d805600d46f..85532f96797 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -29,7 +29,7 @@ AliasNameShort=Alias
 Companies=Bedrifter
 CountryIsInEEC=Landet er en del av det europeiske økonomiske fellesskap
 ThirdPartyName=Tredjepart navn
-ThirdPartyEmail=Third party email
+ThirdPartyEmail=Tredjeparts e-post
 ThirdParty=Tredjepart
 ThirdParties=Tredjeparter
 ThirdPartyProspects=Prospekter
@@ -267,7 +267,7 @@ CustomerAbsoluteDiscountShort=Absolutt rabatt
 CompanyHasRelativeDiscount=Denne kunden har en rabatt på <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Denne kunden har ingen relative rabatter angitt
 CompanyHasAbsoluteDiscount=Denne kunden har tilgjengelige prisavslag (kreditnotaer eller tidligere innbetalinger) for <b>%s</b>%s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Denne kunden har rabatt tilgjengelig (tilbud, nedbetalinger) for <b>%s</b>%s
 CompanyHasCreditNote=Denne kunden har fortsatt kreditnotaer for <b>%s %s</b>
 CompanyHasNoAbsoluteDiscount=Denne kunden har ingen rabatt tilgjengelig
 CustomerAbsoluteDiscountAllUsers=Absolutte rabatter (innrømmet av alle brukere)
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index 7cd4388f324..f2bd37dea86 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -88,8 +88,8 @@ ContactNameAndSignature=For %s, navn og signatur:
 OnlyLinesWithTypeServiceAreUsed=Kun linjer med type "Service" vi bli klonet.
 CloneContract=Klon kontrakt
 ConfirmCloneContract=Er du sikker på at du vil klone kontrakten <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
+LowerDateEndPlannedShort=Nedre planlagt sluttdato for aktive tjenester
+SendContractRef=Kontraktsinformasjon __REF__
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Salgsrepresentant som signerer kontrakten
 TypeContact_contrat_internal_SALESREPFOLL=Salgsrepresentant som følger opp kontrakten
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 7b277094d8c..00765bf0366 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -104,7 +104,7 @@ ErrorForbidden2=Tillatelse for denne innloggingen kan settes av Dolibarr-adminis
 ErrorForbidden3=Det ser ut til at Dolibarr ikke brukes gjennom en autentisert sesjon. Du kan lese mer i dokumentasjonen om hvordan du håndterer autentisering (htaccess, mod_auth eller andre...).
 ErrorNoImagickReadimage=Funksjonen imagick_readimage finnes ikke på denne PHP-installasjonen. Forhåndsvisning er da ikke mulig. Administrator kan slå av denne fanen i Oppsett - Visning.
 ErrorRecordAlreadyExists=Posten eksistererer fra før.
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=Denne etiketten eksisterer allerede
 ErrorCantReadFile=Kunne ikke lese filen '%s'
 ErrorCantReadDir=Kunne ikke lese mappen '%s'
 ErrorBadLoginPassword=Feil verdi for brukernavn eller passord
@@ -158,7 +158,7 @@ ErrorPriceExpression22=Negativt resultat '%s'
 ErrorPriceExpressionInternal=Intern feil '%s'
 ErrorPriceExpressionUnknown=Ukjent feil '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Kilde- og mållager må være ulik
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorTryToMakeMoveOnProductRequiringBatchData=Feil, du prøver å utføre lagerbevegelse uten LOT/serienummer-informasjon, på produkt '%s', som krever LOT/serienummer-informasjon
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Alle registrerte mottak må først verifiseres (godkjent eller nektet) før dette kan utføres
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Alle registrerte mottak må først verifiseres (godkjent) før dette kan utføres
 ErrorGlobalVariableUpdater0=HTTP forespørsel feilet med meldingen '%s'
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index 4ad1a070227..bc667cdc7bc 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Kansellering av feriesøknader
 EmployeeLastname=Ansattes etternavn
 EmployeeFirstname=Ansattes fornavn
 TypeWasDisabledOrRemoved=Ferietype (id %s) ble deaktivert eller slettet
+LastHolidays=Siste %s ferieforespørsler
+AllHolidays=Alle ferieforespørsler
 
 ## Configuration du Module ##
 LastUpdateCP=Siste automatiske oppdatering av ferietildeling
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index f6a416a00a9..c151ab8ee95 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -53,7 +53,7 @@ UseDateWithoutHourOnFichinter=Skjuler timer- og minutt-feltene for intervensjons
 InterventionStatistics=Statistikk over intervensjoner
 NbOfinterventions=Antall intervensjonskort
 NumberOfInterventionsByMonth=Antall intervensjonskort etter måned (validasjonsdato)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+AmountOfInteventionNotIncludedByDefault=Beløp fra intervensjoner er ikke inkludert som standard i overskudd (i de fleste tilfeller er tidsplaner brukt til å regne tid brukt). Legg til alternativ PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT til 1 i hjem-oppsett-andre for å inkludere dem.
 ##### Exports #####
 InterId=Intervensjons-ID
 InterRef=Intervensjonsref.
diff --git a/htdocs/langs/nb_NO/ldap.lang b/htdocs/langs/nb_NO/ldap.lang
index 7f5e6d860e4..92819747f8d 100644
--- a/htdocs/langs/nb_NO/ldap.lang
+++ b/htdocs/langs/nb_NO/ldap.lang
@@ -6,7 +6,7 @@ LDAPInformationsForThisContact=Informasjon i LDAP-databasen for denne kontakten
 LDAPInformationsForThisUser=Informasjon i LDAP-databasen for denne brukeren
 LDAPInformationsForThisGroup=Informasjon i LDAP-databasen for denne gruppen
 LDAPInformationsForThisMember=Informasjon i LDAP-databasen for dette medlemmet
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=Informasjon i LDAP-database for denne medlemstypen
 LDAPAttributes=LDAP-attributter
 LDAPCard=LDAP-kort
 LDAPRecordNotFound=Fant ikke posten i LDAP-databasen
@@ -21,7 +21,7 @@ LDAPFieldSkypeExample=Eksempel: skypeNavn
 UserSynchronized=Brukeren er synkronisert
 GroupSynchronized=Gruppe synkronisert
 MemberSynchronized=Medlem synkronisert
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=Medlemstype synkronisert
 ContactSynchronized=Kontakt synkronisert
 ForceSynchronize=Tving synkronisering Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Kunne ikke lese LDAP-databasen. Sjekk LDAP-modulens innstillinger og databasetilgjengelighet.
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index fb2aaa63eba..b2f81897887 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -70,10 +70,10 @@ EMailSentToNRecipients=E-post sendt til %s mottakere.
 EMailSentForNElements=Epost sendt for %s elementer
 XTargetsAdded=<b>%s</b> mottakere lagt til i målliste
 OnlyPDFattachmentSupported=Hvis PDF-dokumentene allerede er generert for objektene som skal sendes, blir de vedlagt e-post. Hvis ikke, vil ingen e-post bli sendt (merk også at pdf-dokumenter bare støttes som vedlegg i masseutsendelse i denne versjonen).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
-OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
+AllRecipientSelected=Mottakerne av %s-posten valgt (hvis e-posten er kjent).
+GroupEmails=Gruppe e-postmeldinger
+OneEmailPerRecipient=Én e-post per mottaker (som standard, en e-post per post valgt)
+WarningIfYouCheckOneRecipientPerEmail=Advarsel, hvis du merker av denne boksen, betyr det at bare en e-post vil bli sendt for flere forskjellige valgte poster, så hvis meldingen inneholder erstatningsvariabler som refererer til data i en post, blir det ikke mulig å erstatte dem.
 ResultOfMailSending=Resultat av masseutsendelse av epost
 NbSelected=Ant. valgt
 NbIgnored=Ant. ignorert
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unike kontakter/adresser
 MailNoChangePossible=Du kan ikke endre mottagere når utsendelsen er godkjent
 SearchAMailing=Finn utsendelse
 SendMailing=Send utesendelse
-SendMail=Send e-post
 SentBy=Sendt av
 MailingNeedCommand=Å sende en epost kan utføres fra kommandolinjen. Spør din server-administrator å kjøre følgende kommando for å sende e-post til alle mottakere:
 MailingNeedCommand2=Du kan imidlertid sende dem online ver å sette parameteret MAILING_LIMIT_SENDBYWEB til en verdi tilsvarende den maksimale antalle e-poster du ønsker å sende i en økt.
@@ -115,7 +114,7 @@ DeliveryReceipt=Levering godkj.
 YouCanUseCommaSeparatorForSeveralRecipients=Du kan bruke <b>komma</b> som skilletegn for å angi flere mottakere.
 TagCheckMail=Spor post åpning
 TagUnsubscribe=Avmeldingslink
-TagSignature=Signature of sending user
+TagSignature=Signatur for sender
 EMailRecipient=E-postmottaker
 TagMailtoEmail=E-postmottaker (inkluderer html "mailto:" lenke)
 NoEmailSentBadSenderOrRecipientEmail=Ingen e-post sendt. Feil på avsender eller mottaker. Verifiser brukerprofil
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index d9a3d0458f1..d3e4ad45d00 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -263,11 +263,13 @@ DateBuild=Rapport byggedato
 DatePayment=Dato for betaling
 DateApprove=Godkjennelsesdato
 DateApprove2=Godkjennelsesdato (2. godkjennelse)
-RegistrationDate=Registration date
+RegistrationDate=Registreringsdato
 UserCreation=Opprettelse av bruker
 UserModification=Endre bruker
+UserValidation=Valideringsbruker
 UserCreationShort=Oppr. bruker
 UserModificationShort=Endre bruker
+UserValidationShort=Valid. bruker
 DurationYear=år
 DurationMonth=måned
 DurationWeek=uke
@@ -378,15 +380,15 @@ VATIN=IGST
 VATs=Salgsavgifter
 VATINs=IGST skatt
 LT1=Salgsskatt 2
-LT1Type=Sales tax 2 type
+LT1Type=Salgsskatt type 2 
 LT2=Salgsskatt 3
-LT2Type=Sales tax 3 type
+LT2Type=Salgsskatt type 3 
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
 VATRate=MVA-sats
-DefaultTaxRate=Default tax rate
+DefaultTaxRate=Standard avgiftssats
 Average=Gjennomsnitt
 Sum=Sum
 Delta=Delta
@@ -598,7 +600,7 @@ Undo=Angre
 Redo=Gjenta
 ExpandAll=Utvid alle
 UndoExpandAll=Angre utvid
-SeeAll=See all
+SeeAll=Se alt
 Reason=Begrunnelse
 FeatureNotYetSupported=Funksjon støttes ikke ennå
 CloseWindow=Lukk vindu
@@ -608,6 +610,7 @@ SendByMail=Send som e-post
 MailSentBy=E-post sendt av
 TextUsedInTheMessageBody=E-mail meldingstekst
 SendAcknowledgementByMail=Send bekrftelse på epost
+SendMail=Send e-post
 EMail=E-post
 NoEMail=Ingen e-post
 Email=E-post
@@ -773,7 +776,7 @@ Genderwoman=Kvinne
 ViewList=Listevisning
 Mandatory=Obligatorisk
 Hello=Hei
-GoodBye=GoodBye
+GoodBye=Farvel
 Sincerely=Med vennlig hilsen
 DeleteLine=Slett linje
 ConfirmDeleteLine=Er du sikker på at du vil slette denne linjen?
@@ -808,6 +811,10 @@ ModuleBuilder=Modulbygger
 SetMultiCurrencyCode=Angi valuta
 BulkActions=Massehandlinger
 ClickToShowHelp=Klikk for å vise verktøytipshjelp
+Website=Webside
+WebSites=Nettsteder
+ExpenseReport=Reiseregning
+ExpenseReports=Utgiftsrapporter
 HR=HR
 HRAndBank=HR og Bank
 AutomaticallyCalculated=Automatisk beregnet
@@ -818,6 +825,9 @@ Websites=Nettsteder
 Events=Hendelser
 EMailTemplates=E-postmaler
 FileNotShared=Filen er ikke delt eksternt
+Project=Prosjekt
+Projects=Prosjekter
+Rights=Rettigheter
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
@@ -877,6 +887,6 @@ SearchIntoExpenseReports=Utgiftsrapporter
 SearchIntoLeaves=Ferier
 CommentLink=Kommentarer
 NbComments=Antall kommentarer
-CommentPage=Comments space
+CommentPage=Kommentarfelt
 CommentAdded=Kommentar lagt til
 CommentDeleted=Kommentar slettet
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 91f685f4b3f..f08eb71eb6c 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -57,11 +57,11 @@ NewCotisation=Nytt bidrag
 PaymentSubscription=Ny bidragsinnbetaling
 SubscriptionEndDate=Abonnementets sluttdato
 MembersTypeSetup=Oppsett av medlemstyper
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
+MemberTypeModified=Medlemstype endret
+DeleteAMemberType=Slett en medlemstype
+ConfirmDeleteMemberType=Er du sikker på at du vil slette denne medlemstypen?
+MemberTypeDeleted=Medlemstype slettet
+MemberTypeCanNotBeDeleted=Medlemstype kan ikke slettes
 NewSubscription=Nytt abonnement
 NewSubscriptionDesc=Med dette skjemaet kan du ta opp abonnement som nytt medlem av organisasjonen. Hvis du ønsker å fornye abonnementet (hvis du allerede er medlem), vennligst kontakt organisasjonsstyret i stedet ved e-post %s.
 Subscription=Abonnement
@@ -168,8 +168,8 @@ TurnoverOrBudget=Omsetning (for et selskap) eller Budsjett (for en organisasjon)
 DefaultAmount=Standardbeløp for abonnement
 CanEditAmount=Besøkende kan velge/endre beløpet på abonnementet sitt
 MEMBER_NEWFORM_PAYONLINE=Gå til online betalingsside
-ByProperties=Av egenskaper
-MembersStatisticsByProperties=Medlemsstatistikk av egenskaper
+ByProperties=Etter egenskap
+MembersStatisticsByProperties=Medlemsstatistikk etter egenskap
 MembersByNature=Dette skjermbildet viser statistikk over medlemmer etter type.
 MembersByRegion=Dette skjermbildet viser statistikk over medlemmer etter region.
 VATToUseForSubscriptions=Mva-sats som skal brukes for abonnementer
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index 46dec11a61f..b2eaa8ae93a 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -3,8 +3,8 @@ ModuleBuilderDesc=Disse verktøyene må kun brukes av erfarne brukere eller utvi
 EnterNameOfModuleDesc=Skriv inn navnet på modulen/applikasjonen du  vil opprette, uten mellomrom. Bruk stor bokstav til å skille ord (For eksempel: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Skriv inn navnet på objektet som skal opprettes, uten mellomrom. Bruk stor bokstav til å skille ord (For eksempel: MyObject, Student, Lærer ...). CRUD-klassefilen, men også API-filen, sider for å liste/legge til/redigere/slette objekt og SQL-filer blir generert .
 ModuleBuilderDesc2=Sti hvor moduler genereres/redigeres (første alternative katalog definert i %s): <strong>%s</strong>
-ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
+ModuleBuilderDesc3=Genererte/redigerbare moduler funnet: <strong> %s</strong>
+ModuleBuilderDesc4=En modul detekteres som "redigerbar" når filen<strong>%s</strong> eksisterer i roten av modulkatalogen
 NewModule=Ny modul
 NewObject=Nytt objekt
 ModuleKey=Modulnøkkel
@@ -12,7 +12,7 @@ ObjectKey=Objektnøkkel
 ModuleInitialized=Modul initialisert
 FilesForObjectInitialized=Filer for nytt objekt '%s' initialisert
 FilesForObjectUpdated=Filer for objektet '%s' oppdatert (.sql-filer og .class.php-fil)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
+ModuleBuilderDescdescription=Skriv inn all generell informasjon som beskriver modulen din her.
 ModuleBuilderDescspecifications=Du kan skrive inn en lang tekst for å beskrive spesifikasjonene til modulen din, som ikke allerede er strukturert i andre faner. Du har alle reglene som skal utvikles innen rekkevidde. Også dette tekstinnholdet vil bli inkludert i den genererte dokumentasjonen (se siste faneblad). Du kan bruke Markdown-format, men det anbefales at du bruker Asciidoc-formatet (Sammenligning mellom .md og .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 ModuleBuilderDescobjects=Her defineres de objektene du vil administrere med modulen din. En CRUD DAO-klasse, SQL-filer, en side med en oversikt over objekter, å opprette/redigere/vise en post og en API vil bli generert.
 ModuleBuilderDescmenus=Denne fanen er dedikert for å definere menyoppføringer som tilbys av modulen din.
@@ -47,13 +47,14 @@ SpecificationFile=Fil med forretningsregler
 LanguageFile=Språkfil
 ConfirmDeleteProperty=Er du sikker på at du vil slette egenskapen<strong> %s</strong>? Dette vil endre kode i PHP klassen, og fjerne kolonne fra tabelldefinisjon av objekt.
 NotNull=Ikke NULL
+NotNullDesc=1=Angi database til IKKE NULL. -1=Tillat nullverdier og tving verdien til NULL hvis tom ('' eller 0).
 SearchAll=Brukt for 'søk alle'
 DatabaseIndex=Database indeks
 FileAlreadyExists=Filen %s eksisterer allerede
 TriggersFile=Fil for trigger-koder
 HooksFile=Fil for hooks-koder
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
+ArrayOfKeyValues=Matrise over nøkler-verdier
+ArrayOfKeyValuesDesc=Matrise av nøkler og verdier der feltet er en kombinasjonsliste med faste verdier
 WidgetFile=Widget-fil
 ReadmeFile=Readme-fil
 ChangeLog=ChangeLog-fil
@@ -67,18 +68,18 @@ IsAMeasure=Er en måling
 DirScanned=Mappe skannet
 NoTrigger=Ingen utløser
 NoWidget=Ingen widget
-GoToApiExplorer=Go to API explorer
-ListOfPermissionsDefined=List of defined permissions
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
-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.
-LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
-MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s)
-PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s)
-HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
-TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
+GoToApiExplorer=Gå til API-utforsker
+ListOfPermissionsDefined=Liste over definerte tillatelser
+EnabledDesc=Betingelse for å ha dette feltet aktivt (Eksempler: 1 eller $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Er feltet synlig? (Eksempler: 0=Aldri synlig, 1=Synlig på liste og opprett/oppdater/vis skjemaer, 2=Bare synlig på listen, 3=Synlig på opprett/oppdater/vis kun skjema. Bruk av negativ verdi betyr at feltet ikke vises som standard på listen, men kan velges for visning)
+IsAMeasureDesc=Kan verdien av feltet bli kumulert for å få en total i listen? (Eksempler: 1 eller 0)
+SearchAllDesc=Er feltet brukt til å søke fra hurtigsøkingsverktøyet? (Eksempler: 1 eller 0)
+SpecDefDesc=Skriv inn all dokumentasjon du vil gi med modulen din, som ikke allerede er definert av andre faner. Du kan bruke .md eller bedre,  .asciidoc-syntaksen.
+LanguageDefDesc=I disse filene skriver du inn alle nøklene og oversettelsene for hver språkfil.
+MenusDefDesc=Her defineres  menyene som tilbys av modulen din (når de er definert, er de synlige i menyeditoren %s)
+PermissionsDefDesc=Definer her de nye tillatelsene som tilbys av modulen din (med en gang de er definert, er de synlige i standardrettighetsoppsettet %s)
+HooksDefDesc=Definer egenskapen <b> module_parts ['hooks'] </b> i modulbeskrivelsen, konteksten av hooks du vil administrere (liste over sammenhenger kan bli funnet ved et søk på '<b> initHooks(</b>'i kjernekode). <br> Rediger hooks-filen for å legge til kode for dine tilkoblede funksjoner (hookable funksjoner kan bli funnet ved et søk på '<b> executeHooks </b>' i kjernekode).
+TriggerDefDesc=Definer koden som skal utføres for hver forretningshendelse utført, i triggerfilen.
+SeeIDsInUse=Se IDer som brukes i installasjonen din
+SeeReservedIDsRangeHere=Se område av reserverte IDer
+ToolkitForDevelopers=Verktøy for Dolibarr-utviklere
diff --git a/htdocs/langs/nb_NO/multicurrency.lang b/htdocs/langs/nb_NO/multicurrency.lang
index 9737d77f622..ede19920207 100644
--- a/htdocs/langs/nb_NO/multicurrency.lang
+++ b/htdocs/langs/nb_NO/multicurrency.lang
@@ -17,4 +17,4 @@ rate=rate
 MulticurrencyReceived=Mottatt, originalvaluta
 MulticurrencyRemainderToTake=Restbeløp, opprinnelig valuta
 MulticurrencyPaymentAmount=Beløp, original valuta
-AmountToOthercurrency=Amount To (in currency of receiving account)
+AmountToOthercurrency=Beløp til (i valuta for mottakskonto)
diff --git a/htdocs/langs/nb_NO/opensurvey.lang b/htdocs/langs/nb_NO/opensurvey.lang
index 09dd74d65ca..4e885b3dc34 100644
--- a/htdocs/langs/nb_NO/opensurvey.lang
+++ b/htdocs/langs/nb_NO/opensurvey.lang
@@ -19,7 +19,7 @@ SelectedDays=Valgte dager
 TheBestChoice=Det beste valget er for øyeblikket
 TheBestChoices=De beste valgene er for øyeblikket
 with=med
-OpenSurveyHowTo=Hvis du samtykker i avgi stemme i denne undersøkelsen, må du legge inn navnet ditt, velge de dataene som passer best for deg og validere med + knappen på enden av linjen
+OpenSurveyHowTo=Hvis du samtykker i å avgi stemme i denne undersøkelsen, må du skrive inn navnet ditt, velge de dataene som passer best for deg og validere med + knappen på enden av linjen
 CommentsOfVoters=Kommentarer fra stemmeavgivere
 ConfirmRemovalOfPoll=Er du sikker på at du vil fjerne denne undersøkelsen (og alle svar)?
 RemovePoll=Fjern undersøkelse
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 1ecdb76d744..65d7345324b 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -76,19 +76,19 @@ MaxSize=Maksimal størrelse
 AttachANewFile=Legg ved ny fil/dokument
 LinkedObject=Lenkede objekter
 NbOfActiveNotifications=Antall notifikasjoner (antall e-postmottakere)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__\nThis is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice  __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendShipping=__(Hello)__\n\nYou will find here the shipping __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendFichInter=__(Hello)__\n\nYou will find here the intervention __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailTest=__(Hei)__\nDette er en testmelding sendt til __EMAIL__.\nDe to linjene er skilt fra hverandre med et linjeskift.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hei)__\nDette er en <b> test </b> e-post (ordtesten må være i fet skrift). De to linjene skilles med et linjeskift.<br><br>__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hei)__\n\nVedlagt faktura __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hallo)__\n\nVi vil minne deg på at fakturaen __REF__ ikke er betalt. \n\n__ONLINE_PAYMENT_URL__\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hei)__\n\nVedlagt tilbud som avtalt __PREF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hei)__\n\nVedlagt tilbud som avtalt __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hei)__\n\nVedlagt ordre __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hei)__\n\nVedlagt vår bestilling __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hei)__\n\nVedlagt faktura __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hei)__\n\nVedlagt finner du forsendelsesinfo __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hei)__\n\nVedlagt intervensjon __REF__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentThirdparty=__(Hei)__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
+PredefinedMailContentUser=__(Hei)__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr er en kompakt ERP/CRM med støtte for flere forretningsmoduler. En demo som viser alle moduler gir ingen mening da dette scenariet aldri skjer (flere hundre tilgjengelig). Derforer flere demoprofiler er tilgjengelig.
 ChooseYourDemoProfil=Velg en demoprofil som passer best til dine krav
 ChooseYourDemoProfilMore=... eller bygg din egen profil<br>(manuell utvelgelse av moduler)
@@ -186,7 +186,7 @@ EMailTextInterventionAddedContact=En ny intervensjon %s er blitt tildelt deg.
 EMailTextInterventionValidated=Intervensjonen %s har blitt validert.
 EMailTextInvoiceValidated=Fakturaen %s har blitt validert.
 EMailTextProposalValidated=Tilbudet %s har blitt validert.
-EMailTextProposalClosedSigned=The proposal %s has been closed signed.
+EMailTextProposalClosedSigned=Forslaget %s er lukket signert.
 EMailTextOrderValidated=Ordren %s har blitt validert.
 EMailTextOrderApproved=Ordren %s er godkjent.
 EMailTextOrderValidatedBy=Ordren %s er blitt registrert av %s
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 149ceb28be6..71c344c3f2b 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -151,7 +151,7 @@ BuyingPrices=Innkjøpspris
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (varer og tjenester)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Toll-/vare-/HS-kode
 CountryOrigin=Opprinnelsesland
 Nature=Natur
 ShortLabel=Kort etikett
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 18f22bd605c..7c92486ce27 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. prosjekt
 ProjectRef=Prosjektsref.
 ProjectId=Prosjekt-ID
 ProjectLabel=Prosjektetikett
-Project=Prosjekt
-Projects=Prosjekter
 ProjectsArea=Prosjektområde
 ProjectStatus=Prosjektstatus
 SharedProject=Alle
@@ -38,6 +36,7 @@ OpenedTasks=Åpne oppgaver
 OpportunitiesStatusForOpenedProjects=Mulighet-beløp på åpne prosjekter etter status
 OpportunitiesStatusForProjects=Mulighet - beløp på prosjekter etter status
 ShowProject=Vis prosjekt
+ShowTask=Vis oppgave
 SetProject=Sett prosjekt
 NoProject=Ingen prosjekter definert
 NbOfProjects=Antall prosjekter
@@ -77,6 +76,7 @@ Time=Tid
 ListOfTasks=Oppgaveliste
 GoToListOfTimeConsumed=Gå til liste for tidsbruk
 GoToListOfTasks=Gå til oppgaveliste
+GanttView=Gantt visning
 ListProposalsAssociatedProject=Oversikt over tilbud relatert til dette prosjektet
 ListOrdersAssociatedProject=Liste over kundeordre tilknyttet prosjektet
 ListInvoicesAssociatedProject=Liste over kundefakturaer tilknyttet prosjektet
@@ -108,6 +108,7 @@ AlsoCloseAProject=Lukk prosjekt også (hold det åpent hvis du fortsatt trenger
 ReOpenAProject=Åpne prosjekt
 ConfirmReOpenAProject=Er du sikker på at du vil gjenåpne dette prosjektet?
 ProjectContact=Prosjekt kontakter
+TaskContact=Oppgavekontakter
 ActionsOnProject=Handlinger i prosjektet
 YouAreNotContactOfProject=Du er ikke en kontakt tilhørende dette private prosjektet
 UserIsNotContactOfProject=Brukeren er ikke en kontakt i dette private prosjektet
@@ -115,7 +116,7 @@ DeleteATimeSpent=Slett tidsbruk
 ConfirmDeleteATimeSpent=Er du sikker på at du vil slette dette tidsforbruket?
 DoNotShowMyTasksOnly=Se oppgaver som tilhører andre, også
 ShowMyTasksOnly=Vis kun oppgaver som tilhører meg
-TaskRessourceLinks=Ressurser
+TaskRessourceLinks=Oppgavekontakter
 ProjectsDedicatedToThisThirdParty=Prosjekter dedikert til denne tredjepart
 NoTasks=Ingen oppgaver for dette prosjektet
 LinkedToAnotherCompany=Knyttet opp til annen tredjepart
@@ -210,4 +211,4 @@ OppStatusLOST=Tapt
 Budget=Budsjett
 # Comments trans
 AllowCommentOnTask=Tillat brukerkommentarer på oppgaver
-AllowCommentOnProject=Allow user comments on projects
+AllowCommentOnProject=Tillat brukerkommentarer på prosjekter
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index 5a017357ac4..60e61e3367a 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -13,3 +13,5 @@ TJM=Gjennomsnittlig dagspris
 CurrentSalary=Nåværende lønn
 THMDescription=Denne verdien kan brukes til å kalkulere tidsforbruket på et prosjekt hvis prosjekt-modulen er i bruk
 TJMDescription=Dene verdien er foreløpig brukt til informasjon, og er ikke brukt i noen kalkulasjoner
+LastSalaries=Siste %s lønnsutbetalinger
+AllSalaries=Alle lønnsutbetalinger
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index f6b2af9f43e..d46f55de5ee 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -22,6 +22,7 @@ Movements=Bevegelser
 ErrorWarehouseRefRequired=Du må angi et navn på lageret
 ListOfWarehouses=Oversikt over lagre
 ListOfStockMovements=Oversikt over bevegelser
+MovementId=Bevegelses-ID
 StockMovementForId=Bevegelse ID %d
 ListMouvementStockProject=Liste over varebevegelser tilknyttet prosjekt
 StocksArea=Område for lager
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Lagernivå må være høyt nok til å legge varen/tj
 StockMustBeEnoughForOrder=Lagernivå må være høyt nok til å legge varen/tjenesten til ordre (sjekk er gjort mot dagens virkelige lagernivå når du legger til en linje i ordren i forhold til hva som er regelen for automatisk lagerendring)
 StockMustBeEnoughForShipment= Lagernivå må være høyt nok til å legge varen/tjenesten til levering (sjekk er gjort mot dagens virkelige lagernivå når du legger til en linje i leveringen i forhold til hva som er regelen for automatisk lagerendring)
 MovementLabel=Bevegelsesetikett
+DateMovement=Dato for bevegelse
 InventoryCode=Bevegelse eller varelager
 IsInPackage=Innhold i pakken
 WarehouseAllowNegativeTransfer=Lagerbeholdning kan ikke være negativ
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index c37b2709af6..00f73a97a9e 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Reiseregning
-ExpenseReports=Reiseregninger
 ShowExpenseReport=Vis utgiftsrapport
 Trips=Reiseregninger
 TripsAndExpenses=Reiseregninger
@@ -12,6 +10,8 @@ ListOfFees=Oversikt over avgifter
 TypeFees=Avgiftstyper
 ShowTrip=Vis utgiftsrapport
 NewTrip=Ny reiseregning
+LastExpenseReports=Siste %s utgiftsrapporter
+AllExpenseReports=Alle utgiftsrapporter
 CompanyVisited=Firma/organisasjon besøkt
 FeesKilometersOrAmout=Beløp eller kilometer
 DeleteTrip=Slett reiseregning
@@ -71,6 +71,8 @@ EX_FUE_VP=Drivstoff PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parkering PV
 EX_CAM_VP=PV vedlikehold og reparasjon
+DefaultCategoryCar=Standard transportmetode
+DefaultRangeNumber=Standard område nummer
 
 ErrorDoubleDeclaration=Du har opprettet en annen reiseregning i overlappende tidsperiode
 AucuneLigne=Ingen reiseregning er opprettet enda
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 80f1546dabd..b17d7e1baa9 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -96,8 +96,8 @@ HierarchicView=Hierarkisk visning
 UseTypeFieldToChange=Bruk feltet Type til endring
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Bruk OpenID til å logge inn
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+WeeklyHours=Timer arbeidet (per uke)
+ExpectedWorkedHours=Forventet arbeidstid pr. uke
 ColorUser=Farge på bruker
 DisabledInMonoUserMode=Deaktivert i vedlikeholds-modus
 UserAccountancyCode=Bruker regnskapskode
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index b03411b700c..093f468bcd2 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -4,10 +4,10 @@ WebsiteSetupDesc=Sett inn antall ulike websider du ønsker. Deretter kan du redi
 DeleteWebsite=Slett wedside
 ConfirmDeleteWebsite=Er du sikker på at du vil slette denne websiden? Alle sider og innhold vil bli slettet.
 WEBSITE_PAGENAME=Sidenavn/alias
-WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+WEBSITE_HTML_HEADER=HTML-header(felles for alle sider)
+HtmlHeaderPage=HTML-spesifikk header for side
 WEBSITE_CSS_URL=URL til ekstern CSS-fil
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
+WEBSITE_CSS_INLINE=CSS-filinnhold (vanlig for alle sider)
 WEBSITE_JS_INLINE=Javascript-filinnhold (felles for alle sider)
 WEBSITE_ROBOT=Robotfil (robots.txt)
 WEBSITE_HTACCESS=Webområde. Htaccess-fil
@@ -17,7 +17,6 @@ EditCss=Rediger stil/CSS eller HTML-header
 EditMenu=Rediger meny
 EditMedias=Rediger media
 EditPageMeta=Rediger Metadata
-Website=Webside
 AddWebsite=Legg til nettside
 Webpage=Nettsted/container
 AddPage=Legg til side/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL til ekstern webserver ikke definert
 NoPageYet=Ingen sider ennå
 SyntaxHelp=Hjelp med spesifikke syntakstips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML kildekode ved hjelp av "Kilde" -knappen i redigeringsprogrammet.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Du kan inkludere PHP kode i denne kilden ved hjelp av tags <strong>&lt;?php ?&gt;</strong>. Følgende globale variabler er tilgjengelige: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> Du kan også inkludere innhold fra en annen side/container med følgende syntaks:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> For å inkludere en <strong>lenke for å laste ned</strong> en fil lagret i <strong>dokument</strong> mappen, bruk <strong>document.php</strong> wrapperen:<br>Eksempel, for en fil i documents/ecm (må være innlogged), er syntaks:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For samme fil i documents/ecm (åpen adgang ved hjelp av sharing hash key), er syntaks:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For en fil i documents/media (åpen mappe for offentlig adgang), er syntaks:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> For å inkludere et <strong>bilde</strong> lagret i <strong>dokument</strong>mappen, bruk <strong>viewimage.php</strong> wrapperen:<br>Eksempel, for et bilde i documents/media (åpen adgang), er syntaks:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Klon side/container
 CloneSite=Klon side
+SiteAdded=Nettsted lagt til
 ConfirmClonePage=Vennligst skriv inn kode/alias for ny side og hvis det er en oversettelse av den klonede siden.
 PageIsANewTranslation=Den nye siden er en oversettelse av gjeldende side?
 LanguageMustNotBeSameThanClonedPage=Du kloner en side som en oversettelse. Språket på den nye siden må være forskjellig fra språket til kildesiden.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Eller opprett en tom side fra grunnen av...
 FetchAndCreate=Hent og opprett
 ExportSite=Eksporter nettside
 IDOfPage=Side-ID
+WebsiteAccount=Nettstedskonto
+WebsiteAccounts=Nettstedskontoer
+AddWebsiteAccount=Opprett nettsidekonto
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index 115cf2fba13..c0e48992bd8 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -57,7 +57,7 @@ StatusMotif7=Rettslig avgjørelse
 StatusMotif8=Annen grunn
 CreateForSepaFRST=Opprett direktedebetsfil (SEPA FRST)
 CreateForSepaRCUR=Opprett direktedebitfil (SEPA RCUR)
-CreateAll=Create direct debit file (all)
+CreateAll=Opprett direktedebetfil (alle)
 CreateGuichet=Bare kontor
 CreateBanque=Bare bank
 OrderWaiting=Venter på behandling
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index aeb9bbddbb6..c14d487c696 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -43,6 +43,8 @@ Sincerely=Met vriendelijke groeten
 DeleteLine=Verwijder lijn
 ClassifyBilled=Wijzig Status naar "gefactureerd"
 Exports=Exporten
+Website=Website
+ExpenseReports=Uitgaven rapporten
 Select2NotFound=Geen resultaten gevonden
 Select2LoadingMoreResults=Laden van meer resultaten...
 Select2SearchInProgress=Zoeken is aan de gang...
diff --git a/htdocs/langs/nl_BE/website.lang b/htdocs/langs/nl_BE/website.lang
index 778e3207529..fd730ac6392 100644
--- a/htdocs/langs/nl_BE/website.lang
+++ b/htdocs/langs/nl_BE/website.lang
@@ -6,7 +6,6 @@ WEBSITE_CSS_URL=URL van extern CSS bestand
 MediaFiles=Mediabibliotheek
 EditMenu=Bewerk menu
 EditPageMeta=Meta bewerken
-Website=Website
 PreviewOfSiteNotYetAvailable=De voorvertoning van uw website <strong>%s</strong> is nog niet beschikbaar. U moet eerst een pagina toevoegen.
 ViewSiteInNewTab=Bekijk de site in een nieuwe tab
 ViewPageInNewTab=Bekijk de pagina in een nieuwe tab
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 014a784c8a7..bd3825a894b 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Automatisch detecteren (taal van de browser)
 FeatureDisabledInDemo=Functionaliteit uitgeschakeld in de demonstratie
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Rechten
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Alleen elementen van ingeschakelde <a href="%s">modules</a> worden getoond.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Hiermee kunt meerdere bedrijven beheren in Dolibarr
 Module6000Name=Workflow
 Module6000Desc=Workflow beheer
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Beheer van verlofverzoeken
 Module20000Desc=Bevestig en volg verlofverzoeken van medewerkers
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature om e-mails met behulp van methode "PHP ma
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Regel voor te genereren suggestie- en validatiewachtwo
 DisableForgetPasswordLinkOnLogonPage=Verberg de link "Wachtwoord vergeten?" op de inlogpagina
 UsersSetup=Gebruikersmoduleinstellingen
 UserMailRequired=E-mail verplicht om een nieuwe gebruiker creëren
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang
index 96922045052..a8cf47e3db3 100644
--- a/htdocs/langs/nl_NL/commercial.lang
+++ b/htdocs/langs/nl_NL/commercial.lang
@@ -70,3 +70,9 @@ Stats=Verkoopstatistieken
 StatusProsp=Prospect-status
 DraftPropals=Ontwerp van commerciële voorstellen
 NoLimit=Geen limiet
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index dd9942207fc..fd6b7ffd558 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 4bc7aa6e84d..224b8427df2 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unieke contacten van bedrijven
 MailNoChangePossible=Ontvangers voor gevalideerde EMailings kunnen niet worden gewijzigd
 SearchAMailing=Zoek een EMailing
 SendMailing=Verzend EMailing
-SendMail=Verzend e-mail
 SentBy=Verzonden door
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=U kunt ze echter online verzenden door toevoeging van de parameter MAILING_LIMIT_SENDBYWEB met een waarde van het maximaal aantal e-mails dat u wilt verzenden per sessie.
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 65a140c45c7..011d1c10c3a 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Goedkeurings datum (tweede goedkeuring)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Gebruiker aanmaken
 UserModificationShort=Gebruiker wijzigen
+UserValidationShort=Valid. user
 DurationYear=jaar
 DurationMonth=maand
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Verzend per mail
 MailSentBy=E-mail verzonden door
 TextUsedInTheMessageBody=E-mailinhoud
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Verzend e-mail
 EMail=E-mail
 NoEMail=Geen e-mail
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Onkostennota's 
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatisch berekend
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Gebeurtenissen
 EMailTemplates=Email documentensjablonen
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projecten
+Rights=Rechten
 # Week day
 Monday=Maandag
 Tuesday=Dinsdag
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index eea17fbdbca..1cd17e1d894 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Omzet (voor een bedrijf) of Budget (voor een stichting)
 DefaultAmount=Standaard hoeveelheid van het abonnement
 CanEditAmount=Bezoeker kan kiezen / wijzigen bedrag van zijn inschrijving
 MEMBER_NEWFORM_PAYONLINE=Spring op geïntegreerde online betaalpagina
-ByProperties=Volgens eigenschappen
-MembersStatisticsByProperties=Leden statistiek volgens eigenschappen
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Dit scherm toont statistieken over de leden per aard.
 MembersByRegion=Dit scherm tonen statistieken over de leden per streek.
 VATToUseForSubscriptions=BTW tarief voor inschrijvingen
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 678ad117dc1..3b9ef4c1fac 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projecten
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Iedereen
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Toon project
+ShowTask=Toon taak
 SetProject=Stel project in
 NoProject=Geen enkel project gedefinieerd of in eigendom
 NbOfProjects=Aantal projecten
@@ -77,6 +76,7 @@ Time=Tijd
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Lijst van aan het project verbonden offertes
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Project heropenen
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projectcontacten
+TaskContact=Task contacts
 ActionsOnProject=Acties in het project
 YouAreNotContactOfProject=U bent geen contactpersoon van dit privé project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Verwijder gespendeerde tijd
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Bekijk ook taken niet aan mij toegewezen
 ShowMyTasksOnly=Bekijk alleen taken die aan mij toegewezen
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projecten gewijd aan deze derde partij
 NoTasks=Geen taken voor dit project
 LinkedToAnotherCompany=Gekoppeld aan een andere derde partij
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index f5d73961361..31d15ddde38 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Huidige salaris
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index a17b6be09e2..fc7bae6577b 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -22,6 +22,7 @@ Movements=Mutaties
 ErrorWarehouseRefRequired=Magazijnreferentienaam is verplicht
 ListOfWarehouses=Magazijnenlijst
 ListOfStockMovements=Voorraadmutatielijst
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Magazijnen
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label van de verplaatsing
+DateMovement=Date of movement
 InventoryCode=Verplaatsing of inventaris code
 IsInPackage=Vervat in pakket
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index 47fd3bef8a8..f3c1c947a15 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Onkostennota's 
 ShowExpenseReport=Show expense report
 Trips=Onkostennota's 
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Vergoedingenlijst
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Kilometerskosten
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index bdde8ca03e7..fac92a21577 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignoruj błędy zduplikowanych rekordów (INSERT IGNORE)
 AutoDetectLang=Autodetekcja (język przeglądarki)
 FeatureDisabledInDemo=Funkcja niedostępna w wersji demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Uprawnienia
 BoxesDesc=Widgety są komponentami pokazującymi pewne informacje, które możesz dodać w celu spersonalizowania niektórych stron. Możesz wybrać pomiędzy pokazaniem wigetu lub nie poprzez wybranie docelowej strony i kliknięcie "Aktywacja", lub poprzez kliknięcie na kosz w celu wyłączenia go.
 OnlyActiveElementsAreShown=Tylko elementy z <a href="%s">aktywnych modułów</a> są widoczne.
 ModulesDesc=Moduły Dolibarr definiują, która aplikacja / funkcja jest włączona w oprogramowaniu. Niektóre aplikacje / moduły wymagają uprawnień, które musisz przyznać użytkownikom po ich aktywacji. Kliknij przycisk ON/OFF, aby włączyć moduł/aplikację.
@@ -593,7 +592,7 @@ Module5000Desc=Pozwala na zarządzanie wieloma firmami
 Module6000Name=Workflow
 Module6000Desc=Zarządzania przepływem pracy
 Module10000Name=Strony internetowe
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Zarządzanie "Pozostaw Żądanie"
 Module20000Desc=Zadeklaruj oraz nadzoruj wnioski pracowników dotyczące wyjść z pracy
 Module39000Name=Partia produktów
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Funkcja wysłać maile za pomocą metody "PHP poc
 TranslationSetup=Ustawienia tłumaczenia
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Artykuł sugerował, aby wygenerować hasła
 DisableForgetPasswordLinkOnLogonPage=Nie pokazuj link "Zapomniałeś hasła" na stronie logowania
 UsersSetup=Użytkownicy modułu konfiguracji
 UserMailRequired=Email wymagane, aby utworzyć nowego użytkownika
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=Ustawianie modułu HR
 ##### Company setup #####
diff --git a/htdocs/langs/pl_PL/commercial.lang b/htdocs/langs/pl_PL/commercial.lang
index 3d7f2e83a7e..ec04d04420e 100644
--- a/htdocs/langs/pl_PL/commercial.lang
+++ b/htdocs/langs/pl_PL/commercial.lang
@@ -70,3 +70,9 @@ Stats=Statystyka sprzedaży
 StatusProsp=Stan oferty
 DraftPropals=Szkic oferty handlowej
 NoLimit=Bez limitu
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index edf691bb181..1e80d8c5f89 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Anulowanie wniosku urlopowego
 EmployeeLastname=Nazwisko pracownika
 EmployeeFirstname=Imię pracownika
 TypeWasDisabledOrRemoved=Typ urlopu (id %s) zostało wyłączone lub usunięte
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Ostatnia automatyczna aktualizacja alokacji urlopów
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index df0124e14e8..6dbeb4b3601 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unikalne kontakty firm
 MailNoChangePossible=Odbiorcy dla potwierdzonych mailingów nie mogą być zmienieni
 SearchAMailing=Szukaj mailingu
 SendMailing=Wyślij mailing
-SendMail=Wyślij mail
 SentBy=Wysłane przez
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Możesz jednak wysłać je w sieci poprzez dodanie parametru MAILING_LIMIT_SENDBYWEB o wartości max liczba wiadomości e-mail, który chcesz wysłać przez sesji.
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 6226309ffca..8703c8c7ddc 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Termin zatwierdzania (drugie zatwierdzenie)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Utwórz użytkownika
 UserModificationShort=Zmień użytkownika
+UserValidationShort=Valid. user
 DurationYear=rok
 DurationMonth=miesiąc
 DurationWeek=tydzień
@@ -608,6 +610,7 @@ SendByMail=Wyślij przez email
 MailSentBy=E-mail został wysłany przez
 TextUsedInTheMessageBody=Zawartość emaila 
 SendAcknowledgementByMail=Wyślij email potwierdzający
+SendMail=Wyślij mail
 EMail=E-mail
 NoEMail=Brak e-mail
 Email=Adres e-mail
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Ustaw walutę
 BulkActions=Masowe działania
 ClickToShowHelp=Kliknij, aby wyświetlić pomoc etykiety
+Website=Strona WWW
+WebSites=Web sites
+ExpenseReport=Raport kosztów
+ExpenseReports=Raporty kosztów
 HR=Dział personalny
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatycznie wykalkulowane
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Wydarzenia
 EMailTemplates=Szablony wiadomości e-mail
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projekty
+Rights=Uprawnienia
 # Week day
 Monday=Poniedziałek
 Tuesday=Wtorek
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 613c9efb803..bdcdb2130c8 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Obrót (dla firmy) lub Budżet (na fundamencie)
 DefaultAmount=Domyślną kwotę abonamentu
 CanEditAmount=Użytkownik może wybrać / edytować kwotę swojej subskrypcji
 MEMBER_NEWFORM_PAYONLINE=Przejdź na zintegrowanej stronie płatności online
-ByProperties=Według cech
-MembersStatisticsByProperties=Użytkownicy statystyki cech
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Ten ekran wyświetli statystyki dotyczące członków przez naturę.
 MembersByRegion=Ten ekran wyświetli statystyki dotyczące członków w regionie.
 VATToUseForSubscriptions=Stawka VAT użyć do subskrypcji
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index f4ad7124760..2e16a9ae7f3 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=Plik %s już istnieje
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 6d05c391336..294a7be0a5d 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. projekt
 ProjectRef=Numer referencyjny projektu
 ProjectId=Projekt Id
 ProjectLabel=Etykieta projektu
-Project=Project
-Projects=Projekty
 ProjectsArea=Obszar projektów
 ProjectStatus=Status projektu
 SharedProject=Wszyscy
@@ -38,6 +36,7 @@ OpenedTasks=Otwarte zadania
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Pokaż projekt
+ShowTask=Pokaż zadanie
 SetProject=Ustaw projekt
 NoProject=Żadny projekt niezdefiniowany lub nie jest twoją własnością
 NbOfProjects=Liczba projektów
@@ -77,6 +76,7 @@ Time=Czas
 ListOfTasks=Lista zadań
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Idź do listy zadań
+GanttView=Gantt View
 ListProposalsAssociatedProject=Lista ofert handlowcych związanych z projektem
 ListOrdersAssociatedProject=Lista zamówień klientów powiązanych z projektem
 ListInvoicesAssociatedProject=Lista faktur klientów powiązanych z projektem
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Otwórz projekt
 ConfirmReOpenAProject=Czy otworzyć na nowo ten projekt?
 ProjectContact=Kontakty projektu
+TaskContact=Task contacts
 ActionsOnProject=Działania w ramach projektu
 YouAreNotContactOfProject=Nie jestes kontaktem tego prywatnego projektu
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Usuń czas spędzony
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Zobacz również zadania nie przypisane do mnie
 ShowMyTasksOnly=Wyświetl tylko zadania przypisane do mnie
-TaskRessourceLinks=Zasoby
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej stronie trzeciej
 NoTasks=Brak zadań dla tego projektu
 LinkedToAnotherCompany=Powiązane z innymą częścią trzecią
diff --git a/htdocs/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang
index 524b72b172d..bf440ac22ab 100644
--- a/htdocs/langs/pl_PL/salaries.lang
+++ b/htdocs/langs/pl_PL/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Aktualne wynagrodzenie
 THMDescription=Ta wartość może być użyta do obliczenia kosztów poniesionych przy projekcie do którego przystąpili użytkownicy jeżeli moduł projektów jest używany
 TJMDescription=Ta wartość jest aktualnie jedynie informacją i nie jest wykorzystywana do jakichkolwiek obliczeń
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 3aa15b4e2a5..34ee2d4babc 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -22,6 +22,7 @@ Movements=Ruchy
 ErrorWarehouseRefRequired=Nazwa referencyjna magazynu wymagana
 ListOfWarehouses=Lista magazynów
 ListOfStockMovements=Wykaz stanu magazynowego
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Powierzchnia magazynów
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Etykieta ruchu
+DateMovement=Date of movement
 InventoryCode=Ruch lub kod inwentaryzacji
 IsInPackage=Zawarte w pakiecie
 WarehouseAllowNegativeTransfer=Zapas może być ujemny
diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
index 8a0ba131b13..307f12a9850 100644
--- a/htdocs/langs/pl_PL/trips.lang
+++ b/htdocs/langs/pl_PL/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Raport kosztów
-ExpenseReports=Raporty kosztów
 ShowExpenseReport=Pokaż raport kosztowy
 Trips=Raporty kosztów
 TripsAndExpenses=Raporty kosztów
@@ -12,6 +10,8 @@ ListOfFees=Wykaz opłat
 TypeFees=Rodzaje opłat
 ShowTrip=Pokaż raport kosztowy
 NewTrip=Nowy raport kosztów
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Kwota lub kilometry
 DeleteTrip=Usuń raport kosztów
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Masz oświadczył kolejny raport wydatków do podobnego zakresu dat.
 AucuneLigne=Nie ma jeszcze raportu wydatki deklarowane
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index a5100d99c4a..635c7d92bce 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Skasuj stronę
 ConfirmDeleteWebsite=Jesteś pewny że chcesz skasować stronę? Całą jej zawartość zostanie usunięta.
 WEBSITE_PAGENAME=Nazwa strony
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL zewnętrznego pliku CSS
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edytuj styl / CSS lub nagłówek HTML
 EditMenu=Edytuj Menu
 EditMedias=Edit medias
 EditPageMeta=Edytuj koniec
-Website=Strona WWW
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Dodaj stronę
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=Brak stron
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Duplikuj stronę
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 48d43fcbebc..5b41ecb5372 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -56,7 +56,6 @@ Code_tiers=Terceiro
 LabelAccount=Conta rótulo
 Sens=Significado
 TransactionNumShort=Nº da transação
-AccountingCategory=Grupos personalizados
 GroupByAccountAccounting=Agrupar pela conta da Contabilidade
 NotMatch=Não Definido
 DelYear=Ano a ser deletado
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 1063202a47d..22bbcbe7fec 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Publisher=Editor
 VersionProgram=Versão Programa
 VersionLastInstall=Versão de instalação inicial
 VersionLastUpgrade=Atualização versão mais recente
@@ -174,13 +173,9 @@ ModulesDevelopYourModule=Desenvolver seus próprios app/módulos
 ModulesDevelopDesc=Você pode desenvolver ou encontrar um parceiro que faça isso, o seu módulo personalizado
 DOLISTOREdescriptionLong=Ao invés de trocar para o website em <a href="https://www.dolistore.com">www.dolistore.com</a> para encontrar um módulo externo, você pode usar esta ferramenta integrada que realizará a busca na loja virtual externa pra você (pode ser lento, precisa de um acesso à Internet)...
 FreeModule=Grátis
-CompatibleUpTo=Compatível com a versão %s
 NotCompatible=Este módulo não parece ser compatível com o seu Dolibarr %s (Mín %s - Máx %s).
 CompatibleAfterUpdate=Este módulo exige uma atualização do seu Dolibarr %s (Mín %s - Máx %s).
 SeeInMarkerPlace=Ver na Loja Virtual
-Updated=Atualizado
-Nouveauté=Novidade
-AchatTelechargement=Comprar / Download
 GoModuleSetupArea=Para lançar/instalar um novo módulo, vá para a área de configuração do Módulo em <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, o site oficial para baixar módulos externos.
 DoliPartnersDesc=Lista das empresas que realizam o serviço de desenvolvimento de módulos ou funcionalidades personalizadas (Nota: qualquer pessoa com experiência na programação em PHP pode realizar o desenvolvimento personalizado para um projeto com código fonte aberto)
@@ -319,7 +314,6 @@ NoSmsEngine=Sem gestor de envido de SMS disponível. Por default o gestor de env
 PDFDesc=Você pode configurar cada opção global relacionada com geração de PDF
 PDFAddressForging=Regras para forjar caixas de endereços
 HideAnyVATInformationOnPDF=Esconder todas as informações relacionadas com ICMS na geração de PDF
-PDFLocaltax=Regras para %s
 HideLocalTaxOnPDF=Ocultar %s taxa na coluna de taxa de venda no PDF
 HideDescOnPDF=Esconder todas as descrições de produto na geração de PDF
 HideRefOnPDF=Esconder ref. dos produtos na geração de PDF
@@ -499,7 +493,6 @@ Module5000Name=Multi-Empresas
 Module5000Desc=Permite gerenciar várias empresas
 Module6000Name=Fluxo de Trabalho
 Module6000Desc=Gestor de Fluxo de Trabalho
-Module10000Desc=Criar websites públicos com um editor WYSIWYG. Configure apenas o seu servidor web para direcionar para um diretório dedicado para tê-lo online na Internet.
 Module20000Name=Gerenciamento de folgas e férias
 Module20000Desc=Autorizar e acompanhar solicitações de licença de funcionários
 Module39000Desc=Lote ou número de serie, para compra e venda administrado produtos
@@ -776,7 +769,6 @@ DictionarySendingMethods=Métodos do transporte
 DictionaryStaff=Pessoal
 DictionaryOrderMethods=Métodos de compra
 DictionarySource=Origem das propostas / ordens
-DictionaryAccountancyCategory=Grupos personalizados
 DictionaryAccountancysystem=Modelos para o plano de contas
 DictionaryAccountancyJournal=Relatórios da contabilidade
 DictionaryEMailTemplates=Modelos de E-mails
@@ -943,11 +935,9 @@ SimpleNumRefModelDesc=Retorna o número de referênciaReturns com o formato %syy
 ShowProfIdInAddress=Mostrar id proficional com endereço no documento
 ShowVATIntaInAddress=Esconder ICMS dentro num com endereços no documento
 MAIN_DISABLE_METEO=Desativar visualização meteo
-MeteoStdMod=Modo padrão
 MeteoStdModEnabled=Modo padrão habilitado
 MeteoPercentageMod=Modo porcentagem
 MeteoPercentageModEnabled=Modo de porcentagem habilitado
-MeteoUseMod=Clique para usar %s
 TestLoginToAPI=Teste de login para API
 ProxyDesc=Algumas funções do Dolibarr precisam ter acesso a internet para funcionar. Defina esses parâmetros aqui. se o servidor Dolibarr esta atrás de um servidor de proxy, esses parâmetros falam pro Dolibarr como acessar a internet através disso.
 MAIN_PROXY_USE=Use um servidor de proxy (caso contrário acesso direto a internet)
@@ -970,7 +960,6 @@ PathToDocuments=Caminho para documentos
 SendmailOptionMayHurtBuggedMTA=Função para envios de correspondência usando o método "PHP mail direct" irá gerar uma mensagem na correspondência que pode não estar corretamente analisada por algum servidor de recepção de correspondência. Resultando que essa correspondência não pode ser lida pela pessoa hostiada por essa plataforma bugada. É caso de alguns provedores de internet (Ex: Orange na França). Isso não é um problema para o Dolibarr nem dentro PHP mas para servidor receptor de correspondência. Você pode contudo adicionar a opção MAIN_FIX_FOR_BUGGED_MTA para 1 dentro da configuração, outra modificação do Dolibarr para evitar isso. Contudo você pode sofrer problemas com outros servidores que respeitão estritamente os padrões SMTP. A outra solução (RECOMENDADA) é usar o método "SMTP socket library" que não tem desvantagens.
 TranslationKeySearch=Buscar uma chave ou variável de tradução
 TranslationOverwriteKey=Sobrescrever uma variável de tradução
-TranslationDesc=Como definir o idioma exibido no aplicativo :<br>* Systemwide: menu <strong>Início - Configuração - Exibição</strong><br>* Por usuário : <strong>Configuração da exibição por usuário</strong> aba do cartão do usuário (clique no nome do usuário na parte superior da tela).
 TranslationOverwriteDesc=Você também pode sobrescrever as variáveis preenchendo a tabela a seguir. Escolha o seu idioma a partir do "%s" dropdown, insira a variável com a chave da transação em "%s" e a sua nova tradução em "%s"
 TranslationOverwriteDesc2=Você pode usar a outra aba para lhe ajudar a conhecer a chave de tradução a ser empregada
 TranslationString=Variável de tradução
@@ -1005,8 +994,6 @@ RuleForGeneratedPasswords=Regra para sugerir uma senha gerada ou validação de
 DisableForgetPasswordLinkOnLogonPage=Não mostrar o link "Esqueceu a senha" na página de login
 UsersSetup=Configurações de módulo de usuários
 UserMailRequired=EMail é necessário para criação de um novo usuário
-DefaultCategoryCar=Categoria de carro padrão
-DefaultRangeNumber=Número da faixa padrão
 HRMSetup=Configuração do módulo RH
 CompanySetup=Configurações de módulo das empresas
 CompanyCodeChecker=Módulo de geração e verificação de códigos de terceiros (cliente ou fornecedor)
@@ -1069,7 +1056,6 @@ MembersSetup=Configurações de módulo de membros
 AdherentLoginRequired=Gestor de login para cada membro
 AdherentMailRequired=E-Mail é obrigatório para criar um novo membro
 MemberSendInformationByMailByDefault=Marque o checkbox para enviar confirmação de correspondência para membros (validação ou nova contribuição) é ativo por default
-VisitorCanChooseItsPaymentMode=O visitante pode escolher entre os modos de pagamento disponíveis
 LDAPSetup=Configurações do LDAP
 LDAPUsersSynchro=Usuários
 LDAPContactsSynchro=Contatos
diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang
index 1b565c3d549..7c4282502d2 100644
--- a/htdocs/langs/pt_BR/commercial.lang
+++ b/htdocs/langs/pt_BR/commercial.lang
@@ -8,7 +8,6 @@ AddActionRendezVous=Criar um evento de reunião
 ConfirmDeleteAction=Tem certeza que quer deleitaar este evento ?
 CardAction=Ficha de evento
 ActionOnContact=Contato relacionado
-ShowTask=Mostrar tarefa
 ShowAction=Mostrar evento
 ActionsReport=Relatório de eventos
 SalesRepresentative=Representante comercial
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 791b9fd72f2..70e052421b7 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -122,7 +122,6 @@ Limit=Límite
 Logout=Sair
 NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
 Connection=Login
-Now=Agora
 HourStart=Comece hora
 DateAndHour=Data e hora
 DateEnd=Data de término
@@ -353,6 +352,7 @@ Calendar=Calendário
 GroupBy=Agrupar por
 ViewFlatList=Visão da lista resumida
 Fiscalyear=Ano fiscal
+Website=Web Site
 EMailTemplates=Modelos de E-mails
 Saturday=Sabado
 SaturdayMin=Sab
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index 7784dedbe0c..772834e0394 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -92,8 +92,6 @@ NbOfSubscriptions=Número de inscrições
 TurnoverOrBudget=Volume de negócios (para uma empresa) ou de orçamento (para uma fundação)
 CanEditAmount=Visitante pode escolher/editar quantidade da sua subscrição
 MEMBER_NEWFORM_PAYONLINE=Ir na página de pagamento online integrado
-ByProperties=Por características
-MembersStatisticsByProperties=Membros estatísticas por características
 MembersByNature=Esta tela mostrará estatísticas por natureza de usuários.
 MembersByRegion=Esta tela mostrará estatísticas sobre usuários por região.
 VATToUseForSubscriptions=Taxa de VAT para utilizar as assinaturas
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index f4a043a2964..0bfbbc8745a 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -109,7 +109,6 @@ MultipriceRules=Regras de preços por segmento
 UseMultipriceRules=Usar regras de preços do segmento (definido na configuração do módulos produto) para calcular automaticamente o preço de todos os segmentos de acordo com o primeiro segmento
 PercentVariationOver=%% variação sobre %s
 PercentDiscountOver=%% disconto sobre %s
-Build=Produzir
 ProductsMultiPrice=Produtos e preços de cada segmento
 ProductsOrServiceMultiPrice=Preços de Clientes (de produtos ou serviços, multi-preços)
 ProductSellByQuarterHT=Volume de negócios trimestral antes de impostos os produtos
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index b04ef17e381..7d0416f8029 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -25,6 +25,7 @@ OpenedTasks=Tarefas em andamento
 OpportunitiesStatusForOpenedProjects=Montante de oportunidades de projetos abertos de acordo com a situação
 OpportunitiesStatusForProjects=Montante de oportunidades dos projetos pela situação
 ShowProject=Mostrar projeto
+ShowTask=Mostrar tarefa
 NoProject=Nenhum Projeto Definido
 NbOfProjects=Nº de projetos
 TimeSpent=Dispêndio de tempo
diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang
index e7af8b3bb68..e237907482d 100644
--- a/htdocs/langs/pt_BR/trips.lang
+++ b/htdocs/langs/pt_BR/trips.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReports=Os relatórios de despesas
 ShowExpenseReport=Mostrar relatório de despesas
 Trips=Os relatórios de despesas
 TripsAndExpenses=Relatórios de despesas
@@ -24,6 +23,7 @@ TF_TRIP=Transporte
 TF_TRAIN=Trem
 TF_BUS=Ônibus
 TF_PEAGE=Pedágio
+DefaultRangeNumber=Número da faixa padrão
 ErrorDoubleDeclaration=Você declarou outro relatório de despesas em um intervalo de datas semelhante.
 AucuneLigne=Não há relatório de despesas declaradas ainda
 ModePaiement=Forma de pagamento
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index 26071a93156..b9f69199817 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -6,7 +6,6 @@ WEBSITE_PAGENAME=Nome da Página/Apelido
 WEBSITE_CSS_URL=URL do arquivo CSS externo.
 MediaFiles=Biblioteca de mídias
 EditPageMeta=Editar Meta
-Website=Web Site
 PreviewOfSiteNotYetAvailable=A Pré-visualização do seu website <strong>%s</strong> ainda não está disponível. Primeiro você deverá adicionar uma página.
 ViewSiteInNewTab=Visualizar site numa nova aba
 ViewPageInNewTab=Visualizar página numa nova aba
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 384a68acf44..65722e81fd5 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -154,7 +154,7 @@ Sens=Sentido
 Codejournal=Diário
 NumPiece=Número da peça
 TransactionNumShort=Núm. de transação
-AccountingCategory=Personalized groups
+AccountingCategory=Grupos personalizados
 GroupByAccountAccounting=Agrupar por conta contabilística
 AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report <b>%s</b> to show your income/expense with data grouped according to these groups.
 ByAccounts=Por contas
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index a6683f2bb61..b4a1fd68149 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Fundação
 Version=Versão
-Publisher=Publisher
+Publisher=Editor
 VersionProgram=Versão do programa
 VersionLastInstall=Versão inicial instalada
 VersionLastUpgrade=Última atualização da versão
@@ -132,7 +132,7 @@ MaxNbOfLinesForBoxes=Número máximo de linhas para os widgets
 PositionByDefault=Ordem predefinida
 Position=Posição
 MenusDesc=Os gestores de menu definem o conteúdo das duas barras de menu (horizontal e vertical)
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusEditorDesc=O editor de menu permite-lhe definir as entradas de menu personalizadas. Utilize com cuidado para evitar instabilidade e entradas de menu inválidas.<br>Alguns módulos adicionam entradas de menu (principalmente no menu <b>Todos</b>). Se remover algumas destas entradas por engano, poderá restaurá-las, desativando e reativando o módulo.
 MenuForUsers=Menu para os utilizadores
 LangFile=Ficheiro .lang
 System=Sistema
@@ -189,25 +189,24 @@ IgnoreDuplicateRecords=Ignorar erros de registos duplicados (INSERT IGNORE)
 AutoDetectLang=Autodeteção (navegador)
 FeatureDisabledInDemo=Opção desativada em demo
 FeatureAvailableOnlyOnStable=Funcionalidade apenas disponível em versões estáveis ​​oficiais
-Rights=Permissões
 BoxesDesc=Widgets são componentes que mostram alguma informação, os quais pode adicionar a algumas páginas. Pode escolher entre mostrar a widget ou não selecionando a página alvo e clicar em 'Ativar', ou clicando no caixote do lixo para a desativar.
 OnlyActiveElementsAreShown=Só são mostrados os elementos de <a href="%s">módulos ativos</a>.
 ModulesDesc=Os módulos Dolibarr definem as funcionalidades que estão ativas no programa. Alguns módulos requerem permissões de utilizadores, depois de serem ativados. Clique no botão on/off para ativar o módulo/funcionalidade.
 ModulesMarketPlaceDesc=Pode encontrar mais módulos para descarregar noutros sites da internet...
 ModulesDeployDesc=Se as permissões no seu sistema de ficheiros o permitir, você pode usar esta ferramenta para implementar um módulo externo. O módulo será então visível no separador <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module
+ModulesMarketPlaces=Procurar aplicações/módulos externos
+ModulesDevelopYourModule=Desenvolva as suas próprias aplicações/módulos
+ModulesDevelopDesc=Pode desenvolver ou encontrar um parceiro para desenvolver por você, o seu módulo personalizado
 DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)...
 NewModule=Novo
-FreeModule=Free
-CompatibleUpTo=Compatible with version %s
+FreeModule=Livre
+CompatibleUpTo=Compatível com a versão %s
 NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
-Updated=Updated
-Nouveauté=Novelty
-AchatTelechargement=Buy / Download
+Updated=Atualizado
+Nouveauté=Novidade
+AchatTelechargement=Comprar / Download
 GoModuleSetupArea=Para implementar/instalar um novo módulo, vá para a área de configuração do Módulo em <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, o mercado oficial para módulos externos Dolibarr ERP/CRM
 DoliPartnersDesc=Lista de empresas que desenvolvem módulos ou funcionalidades personalizadas (Nota: qualquer pessoa com experiência em programação PHP pode proporcionar o desenvolvimento personalizado para um projeto open source)
@@ -260,17 +259,17 @@ Content=Conteúdo
 NoticePeriod=Período de aviso
 NewByMonth=Novo por mês
 Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
+EMailsSetup=Configuração de emails
+EMailsDesc=Esta página permite substituir os parâmetros PHP relacionados com o envio de emails. Na maioria dos casos em sistemas operativos Unix/Linux, a configuração PHP está correta e estes parâmetros são inúteis.
 EmailSenderProfiles=Emails sender profiles
 MAIN_MAIL_SMTP_PORT=Porta de SMTP/SMTPS (Por predefinição no php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Servidor SMTP/SMTPS (Por predefinição no php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta do servidor SMTP (Não definido em PHP em sistemas de tipo Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Servidor SMTP/SMTPS (Não definido em PHP em sistemas de tipo Unix)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent
+MAIN_MAIL_EMAIL_FROM=Email do emissor para envios email automáticos (Por defeito em php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Remetente de email usado para emails enviados que retornaram erro
 MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia carbono de todos os emails enviados para
-MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos)
+MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de emails (para fins de teste ou demonstrações)
 MAIN_MAIL_SENDMODE=Método de envio de emails
 MAIN_MAIL_SMTPS_ID=ID SMTP, se necessário a autenticação
 MAIN_MAIL_SMTPS_PW=Palavra-passe de SMTP, se necessário a autenticação
@@ -279,7 +278,7 @@ MAIN_MAIL_EMAIL_STARTTLS= Utilizar encriptação TLS (STARTTLS)
 MAIN_DISABLE_ALL_SMS=Desative todos os envios de SMS (para fins de teste ou demonstrações)
 MAIN_SMS_SENDMODE=Método a usar para enviar SMS
 MAIN_MAIL_SMS_FROM=Número de telefone predefinido do remetente para envio de SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Sender email by default for manual sendings (User email or Company email)
+MAIN_MAIL_DEFAULT_FROMTYPE=Email do remetente por predefinição para os envios manuais (E-mail do Utilizador ou da Empresa)
 UserEmail=Email do utilizador
 CompanyEmail=E-mail da empresa
 FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas  Unix. Teste parâmetros sendmail localmente.
@@ -313,8 +312,8 @@ UnpackPackageInModulesRoot=To deploy/install an external module, unpack the pack
 SetupIsReadyForUse=A instalação do módulo terminou. No entanto você deve ativar e configurar o módulo na sua aplicação, indo à página de configuração de módulos: <a href="%s">%s</a>.
 NotExistsDirect=O diretório raiz alternativo não está definido para um diretório existente.<br>
 InfDirAlt=Desde a versão 3 do Dolibarr que é possível definir um diretório raiz alternativo. Isto permite que você consiga armazenar plug-ins e templates, num diretório dedicado.<br>Para tal basta criar um dirétorio na raiz do Dolibarr (ex: dedicado). <br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=For this step, you can submit the .zip file of module package here :
+InfDirExample=<br>Depois declare-o no ficheiro <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Se estas linhas estiverem comentadas com um "#", descomente-as removendo o caracter "#".
+YouCanSubmitFile=Para esta etapa, você pode submeter aqui o ficheiro .zip do pacote do módulo:
 CurrentVersion=Versão atual do Dolibarr
 CallUpdatePage=Vá à página que atualiza a estrutura e dados da base de dados: %s.
 LastStableVersion=Última versão estável
@@ -348,7 +347,7 @@ AddCRIfTooLong=Não há envolvimento automático, por isso, se estiver fora de l
 ConfirmPurge=De certeza que quer executar esta limpeza?<br>Isto eliminará definitivamente todos os seus ficheiros de dados sem forma de os recuperar (ficheiros GCE, ficheiros anexados)
 MinLength=Comprimento mínimo
 LanguageFilesCachedIntoShmopSharedMemory=Ficheiros .lang carregados na memória partilhada
-LanguageFile=Language file
+LanguageFile=Ficheiro de idioma
 ExamplesWithCurrentSetup=Exemplos com a configuração atual
 ListOfDirectories=Lista de diretórios com modelos OpenDocument
 ListOfDirectoriesForModelGenODT=Lista de diretórios que contêm ficheiros template com formato OpenDocument.<br><br>Digite aqui o caminho completo dos diretórios.<br>Adicione um "Enter" entre cada diratório.<br>Para adicionar um diretório do módulo GCE, adicione aqui <b>DOL_DATA_ROOT/ecm/seudiretorio</b>.<br><br>Ficheiros nesses diretórios têm de acabar com <b>.odt</b> ou <b>.ods</b>.
@@ -372,8 +371,8 @@ PDF=PDF
 PDFDesc=Você pode definir cada uma das opções globais relacionadas com a criação de PDF
 PDFAddressForging=Regras para criar caixas de endereço
 HideAnyVATInformationOnPDF=Ocultar todas as informações relativas ao IVA em PDF gerado
-PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale
+PDFLocaltax=Regras para %s
+HideLocalTaxOnPDF=Ocultar taxa %s na coluna de impostos do PDF
 HideDescOnPDF=Ocultar a descrição dos produtos no PDF gerado
 HideRefOnPDF=Ocultar a referência dos produtos no PDF gerado
 HideDetailsOnPDF=Esconder linhas de detalhes do produto no PDF gerado
@@ -409,9 +408,9 @@ ExtrafieldCheckBoxFromList=Caixas de marcação da tabela
 ExtrafieldLink=Vincular a um objeto
 ComputedFormula=Campo calculado
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found'
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list :<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list :<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpselect=A lista de parâmetros tem seguir o seguinte esquema chave,valor (no qual a chave não pode ser '0')<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para que a lista dependa noutra lista de atributos complementares:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para que a lista dependa doutra lista:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')<br><br> por exemplo:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Os parâmetros devem ser ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br> Exemplo: Societe:societe/class/societe.class.php
@@ -443,7 +442,7 @@ DisplayCompanyManagers=Mostrar nomes dos gestores
 DisplayCompanyInfoAndManagers=Exibir a morada da empresa e menus de gestor
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accounting code built by:<br>%s followed by third party supplier code for a supplier accounting code,<br>%s followed by third party customer code for a customer accounting code.
-ModuleCompanyCodePanicum=Return an empty accounting code.
+ModuleCompanyCodePanicum=Retornar um código de contabilidade vazio.
 ModuleCompanyCodeDigitaria=Accounting code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Utilizar uma aprovação de 3 etapas quando o valor (sem impostos) for superior a...
@@ -463,8 +462,8 @@ Field=Campo
 ProductDocumentTemplates=Modelos de documento para gerar documento do produto
 FreeLegalTextOnExpenseReports=Texto legal livre nos relatórios de despesas
 WatermarkOnDraftExpenseReports=Marca d'água nos rascunhos de relatórios de despesa
-AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
+AttachMainDocByDefault=Defina isto como 1 se desejar anexar o documento principal ao email por defeito (se aplicável)
+FilesAttachedToEmail=Anexar ficheiro
 # Modules
 Module0Name=Utilizadores e grupos
 Module0Desc=Gestão de Utilizadores / Funcionários e Grupos
@@ -546,7 +545,7 @@ Module510Name=Pagamento dos ordenados do funcionário
 Module510Desc=Registe o seguinte pagamento dos ordenados do seu funcionário
 Module520Name=Empréstimo
 Module520Desc=Gestão de empréstimos
-Module600Name=Notifications on business events
+Module600Name=Notificações sobre eventos comerciais
 Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails
 Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda.
 Module700Name=Donativos
@@ -566,7 +565,7 @@ Module2000Desc=Permitir a edição de texto utilizando um editor avançado (base
 Module2200Name=Preços dinamicos
 Module2200Desc=Permitir a utilização de expressões matemáticas para os preços
 Module2300Name=Tarefas agendadas
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2300Desc=Gestão de trabalhos agendados (alias cron ou tabela chrono)
 Module2400Name=Eventos/Agenda
 Module2400Desc=Seguir eventos terminados e que estão para ocorrer. Permitir que a aplicação registe eventos automáticos ou eventos manuais ou encontros.
 Module2500Name=Gestão electrónica de conteúdo
@@ -587,13 +586,13 @@ Module3100Desc=Adicionar um botão Skype nas fichas dos usuários/terceiros/cont
 Module3200Name=Registos irreversíveis
 Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries.
 Module4000Name=GRH
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Desc=Gestão de recursos humanos (gestão de departamento e contratos de funcionários)
 Module5000Name=Multiempresa
 Module5000Desc=Permite-lhe gerir várias empresas
 Module6000Name=Fluxo de trabalho
 Module6000Desc=Gestão do fluxo de trabalho
 Module10000Name=Sites da Web
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Gestão de pedidos de licença
 Module20000Desc=Declarar e seguir os pedidos de licença dos funcionários
 Module39000Name=Lote do produto
@@ -888,7 +887,7 @@ DictionaryStaff=Empregados
 DictionaryAvailability=Atraso na entrega
 DictionaryOrderMethods=Métodos de encomenda
 DictionarySource=Origem de orçamentos/encomendas
-DictionaryAccountancyCategory=Personalized groups
+DictionaryAccountancyCategory=Grupos personalizados
 DictionaryAccountancysystem=Modelos para o gráfíco de contas
 DictionaryAccountancyJournal=Diários contabilisticos
 DictionaryEMailTemplates=Modelos de emails
@@ -896,7 +895,7 @@ DictionaryUnits=Unidades
 DictionaryProspectStatus=Estado da prospeção
 DictionaryHolidayTypes=Tipos de licença
 DictionaryOpportunityStatus=Estado da oportunidade para o projeto/lead
-DictionaryExpenseTaxCat=Expense report categories
+DictionaryExpenseTaxCat=Categorias de relatório de despesas
 DictionaryExpenseTaxRange=Expense report range by category
 SetupSaved=Configuração guardada
 SetupNotSaved=A configuração não foi guardada
@@ -947,7 +946,7 @@ Offset=Desvio
 AlwaysActive=Sempre ativo
 Upgrade=Atualização
 MenuUpgrade=Atualizar/Estender
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
+AddExtensionThemeModuleOrOther=Implantar/instalar aplicativo/módulo externo
 WebServer=Servidor web
 DocumentRootServer=Directório raiz do servidor
 DataRootServer=Diretório raiz dos ficheiros de dados
@@ -1044,7 +1043,7 @@ SystemInfoDesc=Esta informação do sistema é uma informação técnica acessí
 SystemAreaForAdminOnly=Esta área só é acessível aos utilizadores administradores. Nenhuma permissão do Dolibarr permite reduzir esta limitação.
 CompanyFundationDesc=Nesta página modifique toda a informação relacionada com a empresa ou fundação que você gere (para isso, clique em no botão "Modificar" ou "Guardar" no fim da página)
 DisplayDesc=Pode encontrar aqui todos os parâmetros relacionados com a aparência do Dolibarr
-AvailableModules=Available app/modules
+AvailableModules=Aplicações/módulos disponíveis
 ToActivateModule=Para ativar módulos, aceder à área de configuração (Configuração->Módulos).
 SessionTimeOut=Tempo limite para a sessão
 SessionExplanation=Este valor assegura que o período de sessões não expirará antes deste momento, se a limpeza de sessão for efetuada internamente pelo PHP (e nada mais). A limpeza de sessões interna do PHP não garante que a sessão expire logo a seguir ao atraso definido. A sessão irá expirar, após o atraso aqui definido, e quando a limpeza de sessão ocorrer, normalmente após cada <b>%s/%s</b> acessos feitos para além deste.<br>Nota: em alguns servidores que possuem mecanismos de limpeza de sessão (cron), as sessões expirarão após o perído predefinido <strong>session.gc_maxlifetime</strong>, independentemente do valor aqui introduzido.
@@ -1092,11 +1091,11 @@ ShowProfIdInAddress=Mostrar ID professionnal com endereços em documentos
 ShowVATIntaInAddress=Ocultar o número IVA Intra-Comunitário com endereços em documentos
 TranslationUncomplete=Tradução parcial
 MAIN_DISABLE_METEO=Desativar vista de meteorologia
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
+MeteoStdMod=Modo padrão
+MeteoStdModEnabled=Modo padrão ativado
+MeteoPercentageMod=Modo percentagem
+MeteoPercentageModEnabled=Modo percentagem ativado
+MeteoUseMod=Clique para usar %s
 TestLoginToAPI=Teste o login à API
 ProxyDesc=Algumas características do Dolibarr precisam de acesso à Internet para funcionar. Defina aqui os parâmetros necessários para tal. Se o servidor Dolibarr estiver atrás de um servidor Proxy, esses parâmetros informam o Dolibarr como aceder à internet através dele.
 ExternalAccess=Acesso externo
@@ -1116,7 +1115,7 @@ ExtraFieldsContacts=Atributos complementares (contacto/morada)
 ExtraFieldsMember=Atributos complementares (membro)
 ExtraFieldsMemberType=Atributos complementares (tipo de membro)
 ExtraFieldsCustomerInvoices=Atributos complementares (faturas)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsCustomerInvoicesRec=Atributos complementares (modelos de faturas)
 ExtraFieldsSupplierOrders=Atributos complementares (encomendas)
 ExtraFieldsSupplierInvoices=Atributos complementares (faturas)
 ExtraFieldsProject=Atributos complementares (projetos)
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Funcionalidade para enviar e-mails usando o méto
 TranslationSetup=Configuração da tradução
 TranslationKeySearch=Procurar uma chave ou texto de tradução
 TranslationOverwriteKey=Modificar o texto de uma tradução
-TranslationDesc=Como definir o idioma exibido: <br>* Systemwide: menu <strong>Início -> Configuração -> Aspeto</strong><br>* Por utilizador: <strong>Configuração do aspeto por utilizador</strong> aba do cartão do utilizador (clique no nome de utlizador, localizado no topo do ecrã).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=Você pode substituir as traduções na seguinte tabela. Escolha o seu idioma na caixa de seleção "%s", insira a chave tradução rm "%s" e sua nova tradução em "%s"
 TranslationOverwriteDesc2=Você pode utilizar o outro separador para ajudá-lo a saber a chave de tradução que tem de usar
 TranslationString=Texto de tradução
@@ -1171,14 +1170,12 @@ RuleForGeneratedPasswords=Regra para gerar as palavras-passe sugeridas ou valida
 DisableForgetPasswordLinkOnLogonPage=Não mostrar a hiperligação "Esqueceu-se da palavra-passe?" na página de inicio de sessão
 UsersSetup=Configuração do módulo "Utilizadores"
 UserMailRequired=O email é obrigatório para poder criar um novo utilizador
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=Configuração do módulo "GRH"
 ##### Company setup #####
 CompanySetup=Configuração do módulo "Empresas"
 CompanyCodeChecker=Módulo para criação e verificação dos códigos de terceiros (clientes ou fornecedores)
-AccountCodeManager=Module for accounting code generation (customer or supplier)
+AccountCodeManager=Módulo para criação de código de contabilidade (cliente ou fornecedor)
 NotificationsDesc=O funcionalidade "Notificações por email" permite que você envie mensagens automáticas para alguns eventos Dolibarr. Os destinatários das notificações podem ser definidos:
 NotificationsDescUser=* por utilizador, um utilizador de cada vez
 NotificationsDescContact=* por contactos de terceiros (clientes ou fornecedores), um contacto de cada vez
@@ -1253,7 +1250,7 @@ MemberMainOptions=Opções principais
 AdherentLoginRequired= Gerir um login para cada membro
 AdherentMailRequired=O email é obrigatório para criar um novo membro
 MemberSendInformationByMailByDefault=Selecione para enviar email de confirmação aos membros (validação ou nova subscrição), está ativada por defeito
-VisitorCanChooseItsPaymentMode=Visitor can choose among available payment modes
+VisitorCanChooseItsPaymentMode=O visitante pode escolher entre os modos de pagamento disponíveis
 ##### LDAP setup #####
 LDAPSetup=Configuração do módulo "LDAP"
 LDAPGlobalParameters=Parâmetros globais
@@ -1408,7 +1405,7 @@ CompressionOfResources=Compressão das respostas HTTP
 CompressionOfResourcesDesc=Por exemplo, usando a diretiva Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível com os navegadores atuais
 DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record.
-DefaultCreateForm=Default values for creation form
+DefaultCreateForm=Valores predefinidos para o formulário de criação
 DefaultSearchFilters=Filtros de pesquisa predefinidos
 DefaultSortOrder=Default sort orders
 DefaultFocus=Campos de foco predefinidos
@@ -1547,14 +1544,14 @@ Buy=Comprar
 Sell=Vender
 InvoiceDateUsed=Data da fatura usada
 YourCompanyDoesNotUseVAT=Sua empresa não tem configuração definida para usar o IVA (Home - Configuração - Empresa/Organização), pelo que não há opções de configuração do IVA.
-AccountancyCode=Accounting Code
+AccountancyCode=Código de Contabilidade
 AccountancyCodeSell=Código de contabilidade de vendas
 AccountancyCodeBuy=Código de contabilidade de compras
 ##### Agenda #####
 AgendaSetup=Configuração do módulo "Eventos e agenda"
 PasswordTogetVCalExport=Chave de autorização para exportação do link vcal.
 PastDelayVCalExport=Não exportar evento com mais de
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionaries -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (gerido através do menu Configuração -> Dicionário -> Tipo de eventos da agenda)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Definir este valor automaticamente como o valor predefinido para o campo tipo de evento, no formulário de criação de evento
 AGENDA_DEFAULT_FILTER_TYPE=Definir automaticamente este tipo de evento no filtro de pesquisa da vista agenda
 AGENDA_DEFAULT_FILTER_STATUS=Definido automaticamente este estado para eventos no filtro de pesquisa da vista agenda
@@ -1655,7 +1652,7 @@ ExpenseReportsSetup=Configuração do módulo "Relatórios de Despesas"
 TemplatePDFExpenseReports=Modelos de documentos para a produção de relatórios de despesa 
 ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
+ExpenseReportNumberingModules=Módulo de numeração de relatórios de despesas
 NoModueToManageStockIncrease=Não foi ativado nenhum módulo capaz de efetuar a gestão automática do acréscimo de stock. O acrescimo de stock será efetuado manualmente.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Poderá encontrar as opções das notificações por email ao ativar e configurar o módulo "Notificação".
 ListOfNotificationsPerUser=Lista de notificações por utilizador*
@@ -1695,8 +1692,8 @@ OpportunityPercent=Quando você cria uma oportunidade, você vai definir um valo
 TemplateForElement=Este registo modelo é dedicado a qual elemento
 TypeOfTemplate=Tipo de modelo
 TemplateIsVisibleByOwnerOnly=Modelo é visível apenas pelo dono
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
+VisibleEverywhere=Visível em todo lado
+VisibleNowhere=Visível em nenhum lado
 FixTZ=Corrigir Fuso Horário
 FillFixTZOnlyIfRequired=Exemplo: +2 (preencha somente se experienciar problemas)
 ExpectedChecksum=Checksum esperado
@@ -1712,8 +1709,8 @@ MailToSendSupplierOrder=Para enviar a encomenda ao fornecedor por e-mail
 MailToSendSupplierInvoice=Para enviar a fatura emitida pelo fornecedor por e-mail
 MailToSendContract=Para enviar um contrato
 MailToThirdparty=Para enviar e-mail a partir da página dos terceiros
-MailToMember=To send email from member page
-MailToUser=To send email from user page
+MailToMember=Para enviar e-mails da página do membro
+MailToUser=Para enviar emails da página de usuário
 ByDefaultInList=Mostrar por padrão na vista de lista
 YouUseLastStableVersion=Você possui a última versão estável
 TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta versão principal (sinta-se livre para usá-la nas suas páginas da Internet)
@@ -1728,9 +1725,9 @@ SeeChangeLog=See ChangeLog file (english only)
 AllPublishers=Todos os editores
 UnknownPublishers=Editores desconhecidos
 AddRemoveTabs=Adicionar ou remover separadores
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
+AddDataTables=Adicionar tabelas de objetos
+AddDictionaries=Adicionar tabelas de dicionários
+AddData=Adicionar dados de objetos ou dicionários
 AddBoxes=Adicionar widgets
 AddSheduledJobs=Adicionar trabalhos agendados
 AddHooks=Adicionar hooks
@@ -1756,10 +1753,10 @@ BaseCurrency=Moeda de referência da empresa (vá à configuração da empresa p
 WarningNoteModuleInvoiceForFrenchLaw=Este módulo %s está de acordo com as leis francesas (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Este módulo %s está de acordo com as leis francesas (Loi Finance 2016) porque o módulo Registos Não Reversíveis é ativado automaticamente.
 WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software.
-MAIN_PDF_MARGIN_LEFT=Left margin on PDF
-MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
-MAIN_PDF_MARGIN_TOP=Top margin on PDF
-MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_PDF_MARGIN_LEFT=Margem esquerda do PDF
+MAIN_PDF_MARGIN_RIGHT=Margem direita do PDF
+MAIN_PDF_MARGIN_TOP=Margem superior do PDF
+MAIN_PDF_MARGIN_BOTTOM=Margem inferior do PDF
 ##### Resource ####
 ResourceSetup=Configuração do módulo Recursos
 UseSearchToSelectResource=Utilizar um formulário de pesquisa para escolher um recurso (em vez de uma lista)
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 5133c1fbebb..26276850041 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -12,7 +12,7 @@ Event=Evento
 Events=Eventos
 EventsNb=Número de eventos
 ListOfActions=Lista de Eventos
-EventReports=Event reports
+EventReports=Relatórios de eventos
 Location=Localização
 ToUserOfGroup=Para qualquer utilizador no grupo
 EventOnFullDay=Evento para todo(s) o(s) dia(s)
@@ -35,7 +35,7 @@ AgendaAutoActionDesc= Defina aqui os eventos para os quais deseja que o Dolibarr
 AgendaSetupOtherDesc= Esta página fornece opções para permitir a exportação dos seus eventos do Dolibarr para um calendário externo (Thunderbird, calendário Google, ...)
 AgendaExtSitesDesc=Esta página permite declarar as fontes externas de calendários para ver os seus eventos na agenda do Dolibarr.
 ActionsEvents=Eventos em que o Dolibarr criará uma acção em agenda automáticamente
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup.
+EventRemindersByEmailNotEnabled=Os lembretes de eventos por email não foram ativados na configuração do módulo Agenda
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Terceiro %s, criado
 ContractValidatedInDolibarr=Contrato %s, validado
@@ -67,7 +67,7 @@ OrderApprovedInDolibarr=Encomenda %s, aprovada
 OrderRefusedInDolibarr=Encomenda %s, recusada
 OrderBackToDraftInDolibarr=Encomenda %s, voltou ao estado de rascunho
 ProposalSentByEMail=Orçamento para cliente, %s, enviado por email
-ContractSentByEMail=Contract %s sent by EMail
+ContractSentByEMail=Contrato %s, enviado por email
 OrderSentByEMail=Encomenda de cliente, %s, enviada por email
 InvoiceSentByEMail=Fatura de cliente, %s, enviada por email
 SupplierOrderSentByEMail=Encomenda a fornecedor, %s, enviada por email
@@ -81,14 +81,14 @@ InvoiceDeleted=Fatura eliminada
 PRODUCT_CREATEInDolibarr=O produto %s foi criado
 PRODUCT_MODIFYInDolibarr=O produto %s foi modificado
 PRODUCT_DELETEInDolibarr=O produto %s foi eliminado
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
-EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
-EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
+EXPENSE_REPORT_CREATEInDolibarr=Relatório de despesas %s, criado
+EXPENSE_REPORT_VALIDATEInDolibarr=Relatório de despesas %s, validade
+EXPENSE_REPORT_APPROVEInDolibarr=Relatório de despesas %s, aprovado
+EXPENSE_REPORT_DELETEInDolibarr=Relatório de despesas %s, eliminado
+EXPENSE_REPORT_REFUSEDInDolibarr=Relatório de despesas %s, recusado
 PROJECT_CREATEInDolibarr=Projeto %s criado
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
+PROJECT_MODIFYInDolibarr=Projeto %s, modificado
+PROJECT_DELETEInDolibarr=Projeto %s, eliminado
 ##### End agenda events #####
 AgendaModelModule=Modelos de documento para o evento
 DateActionStart=Data de início
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 116f9f8d304..8a9f278f5c2 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -20,7 +20,7 @@ BoxLastMembers=Últimos membros
 BoxFicheInter=Últimas intervenções
 BoxCurrentAccounts=Saldo de abertura das contas
 BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Latest %s modified products/services
+BoxTitleLastProducts=Os últimos %s produtos/serviços modificados
 BoxTitleProductsAlertStock=Produtos no alerta de stock
 BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
diff --git a/htdocs/langs/pt_PT/commercial.lang b/htdocs/langs/pt_PT/commercial.lang
index 79530e65dc0..386e7836f45 100644
--- a/htdocs/langs/pt_PT/commercial.lang
+++ b/htdocs/langs/pt_PT/commercial.lang
@@ -70,3 +70,9 @@ Stats=Estatísticas de venda
 StatusProsp=Estado da prospeção
 DraftPropals=Orçamentos em rascunho
 NoLimit=Sem limite
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index c576d3ba5bc..4875dc8e3de 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -29,7 +29,7 @@ AliasNameShort=Pseudónimo
 Companies=Empresas
 CountryIsInEEC=País da Comunidade Económica Europeia
 ThirdPartyName=Nome de terceiros
-ThirdPartyEmail=Third party email
+ThirdPartyEmail=Email do terceiro
 ThirdParty=Terceiro
 ThirdParties=Terceiros
 ThirdPartyProspects=Clientes Potenciais
@@ -51,7 +51,7 @@ Lastname=Apelidos
 Firstname=Primeiro Nome
 PostOrFunction=Posto de trabalho
 UserTitle=Título
-NatureOfThirdParty=Nature of Third party
+NatureOfThirdParty=Natureza do terceiro
 Address=Direcção
 State=Distrito
 StateShort=Estado
@@ -267,7 +267,7 @@ CustomerAbsoluteDiscountShort=Desconto Fixo
 CompanyHasRelativeDiscount=Este cliente tem um desconto por defeito de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente não tem descontos relativos por defeito
 CompanyHasAbsoluteDiscount=Este cliente ainda tem créditos de desconto ou depósitos para <b>%s </b>%s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Este cliente tem descontos disponíveis (comercial, pronto pagamento) para <b>%s</b>%s
 CompanyHasCreditNote=Este cliente ainda tem notas de crédito para <b>%s</b> %s
 CompanyHasNoAbsoluteDiscount=Este cliente não tem mas descontos fixos disponiveis
 CustomerAbsoluteDiscountAllUsers=Descontos fixos em curso (acordado por todos os Utilizadores)
diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
index 60b2b3cbd84..a492d1e707c 100644
--- a/htdocs/langs/pt_PT/contracts.lang
+++ b/htdocs/langs/pt_PT/contracts.lang
@@ -31,11 +31,11 @@ NewContract=Novo contrato
 NewContractSubscription=Novo contrato/subscrição
 AddContract=Criar contrato
 DeleteAContract=Eliminar um contrato
-ActivateAllOnContract=Activate all services
+ActivateAllOnContract=Ativar todos os serviços
 CloseAContract=Fechar um contrato
 ConfirmDeleteAContract=Tem certeza que deseja eliminar este contrato e todos os seus serviços?
 ConfirmValidateContract=Tem a certeza que pretende validar este contrato com o nome <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
+ConfirmActivateAllOnContract=Isto irá abrir todos os serviços (ainda não ativos). Tem a certeza que pretende abrir todos os serviços?
 ConfirmCloseContract=Isto irá fechar todos os serviços (ativos ou não). Tem a certeza que pretende fechar este contrato?
 ConfirmCloseService=Tem a certeza que pretende fechar este serviço com a data <b>%s</b>?
 ValidateAContract=Validar um contrato
@@ -69,7 +69,7 @@ BoardRunningServices=Serviços ativos expirados
 ServiceStatus=Estado do serviço
 DraftContracts=Contratos rascunho
 CloseRefusedBecauseOneServiceActive=O contrato não pode ser fechado porque contém pelo menos um serviço aberto.
-ActivateAllContracts=Activate all contract lines
+ActivateAllContracts=Ativar todas as linhas de contrato
 CloseAllContracts=Fechar todos os contratos
 DeleteContractLine=Eliminar uma linha do contrato
 ConfirmDeleteContractLine=Tem a certeza que deseja eliminar esta linha do contrato? 
@@ -88,8 +88,8 @@ ContactNameAndSignature=Nome e assinatura para %s:
 OnlyLinesWithTypeServiceAreUsed=Apenas linhas do tipo "Serviço" irão ser clonadas.
 CloneContract=Clonar contrato
 ConfirmCloneContract=Tem a certeza que pretende clonar o contrato <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
+LowerDateEndPlannedShort=Menor data de término planeada dos serviços ativos
+SendContractRef=Informação contratual __REF__
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Representante de vendas assinante do contrato
 TypeContact_contrat_internal_SALESREPFOLL=Representante de vendas que dá seguimento ao contrato
diff --git a/htdocs/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
index 038a52f67b8..95472ef9dc4 100644
--- a/htdocs/langs/pt_PT/ecm.lang
+++ b/htdocs/langs/pt_PT/ecm.lang
@@ -41,8 +41,8 @@ ECMDirectoryForFiles=Pasta relativa para ficheiros
 CannotRemoveDirectoryContainsFiles=Não se pode eliminar porque contem ficheiros
 ECMFileManager=Explorador de Ficheiros
 ECMSelectASection=Seleccione uma pasta na árvore da esquerda
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
-FileSharedViaALink=File shared via a link
+DirNotSynchronizedSyncFirst=Este diretório parece ter sido ser criado ou modificado fora do módulo ECM. Você deve clicar no botão "Voltar a sincronizar" primeiro para sincronizar o disco e a base de dados para obter o conteúdo desse diretório.
+ReSyncListOfDir=Voltar a sincronizar a lista de diretórios
+HashOfFileContent=Hash do conteúdo do ficheiro
+FileNotYetIndexedInDatabase=Ficheiro ainda não indexado na base de dados (tente voltar a carregá-lo)
+FileSharedViaALink=Ficheiro partilhado via link
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 8dd97e3e31a..8b73b70d359 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Cancelamento do pedido de licença
 EmployeeLastname=Último nome do funcionário
 EmployeeFirstname=Primeiro do nome do funcionário
 TypeWasDisabledOrRemoved=O tipo de licença (ID %s) foi desativado ou removido
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=As últimas atualizações automáticas de alocação de licenças
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index cf0823ff670..6067f25f224 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -53,10 +53,10 @@ AdminLogin=Início de sessão para o administrador da base de dados Dolibarr. De
 PasswordAgain=Contrassenha
 AdminPassword=A senha para o utilizador da base de dados Dolibarr.
 CreateDatabase=Criar base de dados
-CreateUser=Create owner or grant him permission on database
+CreateUser=Crie o proprietário ou conceda-lhe permissão na base de dados
 DatabaseSuperUserAccess=Servidor da Base de Dados - Acesso de Administrador
 CheckToCreateDatabase=Marque a caixa se a base de dados não existir e se deverá ser criada. <br> Neste caso, deve preencher o nome/senha para a conta de administrador, no fim desta página.
-CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.<br>In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists.
+CheckToCreateUser=Selecione se o proprietário da base de dados não existir e deve ser criado, ou se ele existe mas a base de dados não existe e as permissões devem ser concedidas.<br>Neste caso, você deve escolher seu nome de utilizador e palavra-passe e também preencher o nome de utilizador/palavra-passe para a conta do super-utilizador na parte inferior desta página. Se esta caixa estiver desmarcada, a base de dados do proprietário deve existir e deve ser possível ter acesso a esta.
 DatabaseRootLoginDescription=Início de sessão do utilizador autorizado para criar as novas bases de dados ou novos utilizadores, obrigatório se a sua base de dados ou o administrador já existirem.
 KeepEmptyIfNoPassword=Deixar em branco se o utilizador não tiver uma senha (evitar isto)
 SaveConfigurationFile=Guardar valores
diff --git a/htdocs/langs/pt_PT/ldap.lang b/htdocs/langs/pt_PT/ldap.lang
index af613b71a2b..b8a9f96ffa8 100644
--- a/htdocs/langs/pt_PT/ldap.lang
+++ b/htdocs/langs/pt_PT/ldap.lang
@@ -6,7 +6,7 @@ LDAPInformationsForThisContact=Informação da base de dados LDAP deste contacto
 LDAPInformationsForThisUser=Informação da base de dados LDAP deste utilizador
 LDAPInformationsForThisGroup=Informação da base de dados LDAP deste grupo
 LDAPInformationsForThisMember=Informação da base de dados LDAP deste membro
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=Informações na base de dados LDAP para este tipo de membro
 LDAPAttributes=Atributos LDAP
 LDAPCard=Ficha LDAP
 LDAPRecordNotFound=Registo não encontrado na base de dados LDAP
@@ -21,7 +21,7 @@ LDAPFieldSkypeExample=Exemplo: skypeName
 UserSynchronized=Utilizador sincronizado
 GroupSynchronized=Grupo sincronizado
 MemberSynchronized=Membro sincronizado
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=Tipo de membro sincronizado
 ContactSynchronized=Contato sincronizado
 ForceSynchronize=forçar sincronização Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Erro na leitura do anuario LDAP. Verificar a configuração do módulo LDAP e a acessibilidade do anuario.
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 424740b76dd..246c275af6b 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Contactos únicos de empresas
 MailNoChangePossible=Destinatarios de um mailing validado não modificaveis
 SearchAMailing=Procurar um mailing
 SendMailing=Enviar mailing
-SendMail=Enviar e-mail
 SentBy=Enviado por
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o máximo nº de e-mails enviados por Sessão.
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index d181d34ac34..f0f271f136e 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -24,7 +24,7 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexão à Base de Dados
-NoTemplateDefined=No template available for this email type
+NoTemplateDefined=Nenhum modelo disponível para este tipo de e-mail
 AvailableVariables=Variáveis de substituição disponíveis
 NoTranslation=Sem tradução
 Translation=Tradução
@@ -74,10 +74,10 @@ Apply=Aplicar
 BackgroundColorByDefault=Cor de fundo por omissão
 FileRenamed=O ficheiro foi renomeado com sucesso
 FileGenerated=O ficheiro foi gerado com sucesso
-FileSaved=The file was successfully saved
+FileSaved=O ficheiro foi guardado com sucesso
 FileUploaded=O ficheiro foi enviado com sucesso
-FileTransferComplete=File(s) was uploaded successfully
-FilesDeleted=File(s) successfully deleted
+FileTransferComplete=Ficheiros foram carregados com sucesso
+FilesDeleted=Ficheiros eliminados com sucesso
 FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não foi carregado. Clique em 'Adicionar este Ficheiro' para anexar.
 NbOfEntries=Nº de entradas
 GoToWikiHelpPage=Consultar ajuda online (necessita de acesso à Internet)
@@ -104,8 +104,8 @@ RequestLastAccessInError=O último pedido incorreto de acesso à base de dados
 ReturnCodeLastAccessInError=Retornar o código para o último pedido incorreto de acesso à base de dados
 InformationLastAccessInError=Informação sobre o último pedido incorreto de acesso à base de dados
 DolibarrHasDetectedError=O Dolibarr detectou um erro técnico
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices)
+YouCanSetOptionDolibarrMainProdToZero=Você pode ler o ficheiro de log ou definir a opção $dolibarr_main_prod para '0' no seu ficheiro de configuração para obter mais informações.
+InformationToHelpDiagnose=Esta informação pode ser útil para diagnosticar problemas (pode definir a opção $dolibarr_main_prod para '1' se pretender remover estas notificações)
 MoreInformation=Mais Informação
 TechnicalInformation=Informação técnica
 TechnicalID=ID Técnico
@@ -131,8 +131,8 @@ Never=Nunca
 Under=Baixo
 Period=Periodo
 PeriodEndDate=Data de término do período
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
+SelectedPeriod=Período selecionado
+PreviousPeriod=Período anterior
 Activate=Activar
 Activated=Activado
 Closed=Fechado
@@ -201,7 +201,7 @@ Parameter=Parâmetro
 Parameters=Parâmetros
 Value=Valor
 PersonalValue=Valor pessoal
-NewObject=New %s
+NewObject=Novo %s
 NewValue=Novo valor
 CurrentValue=Valor actual
 Code=Código
@@ -236,7 +236,7 @@ Previous=Anterior
 Next=Seguinte
 Cards=Fichas
 Card=Ficha
-Now=Ahora
+Now=Agora
 HourStart=Hora de inicio
 Date=Data
 DateAndHour=Data e Hora
@@ -263,11 +263,13 @@ DateBuild=Data da geração do Relatório
 DatePayment=Data de pagamento
 DateApprove=Data de aprovação
 DateApprove2=Data de aprovação (segunda aprovação)
-RegistrationDate=Registration date
+RegistrationDate=Data de registo
 UserCreation=Utilizador que criou
 UserModification=Utilizador que modificou
+UserValidation=Validation user
 UserCreationShort=Utilizador que criou
 UserModificationShort=Utilizador que modif.
+UserValidationShort=Valid. user
 DurationYear=Ano
 DurationMonth=Mês
 DurationWeek=Semana
@@ -309,8 +311,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=User of creation
-UserModif=User of last update
+UserAuthor=Utilizador que criou
+UserModif=Utilizador que efetuou a última modificação
 b=b.
 Kb=Kb
 Mb=Mb
@@ -363,30 +365,30 @@ Totalforthispage=Total para esta página
 TotalTTC=Total (IVA inc.)
 TotalTTCToYourCredit=Total a crédito
 TotalVAT=Total do IVA
-TotalVATIN=Total IGST
+TotalVATIN=Total IIBS
 TotalLT1=Total Imposto 2
 TotalLT2=Total Imposto 3
 TotalLT1ES=Total de RE
 TotalLT2ES=Total IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
+TotalLT1IN=Total ICBS
+TotalLT2IN=Total IBSE
 HT=Sem IVA
 TTC=IVA incluido
-INCT=Inc. all taxes
+INCT=Todos os impostos incluídos
 VAT=IVA
-VATIN=IGST
+VATIN=IIBS
 VATs=Impostos das vendas
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+VATINs=Impostos IIBS
+LT1=Imposto sobre vendas 2
+LT1Type=Tipo do imposto de vendas 2
+LT2=Imposto sobre vendas 3
+LT2Type=Tipo do imposto de vendas 3
 LT1ES=RE
 LT2ES=IRPF
-LT1IN=CGST
-LT2IN=SGST
+LT1IN=ICBS
+LT2IN=IBSE
 VATRate=Taxa IVA
-DefaultTaxRate=Default tax rate
+DefaultTaxRate=Taxa de imposto predefinida
 Average=Média
 Sum=Soma
 Delta=Divergencia
@@ -415,7 +417,7 @@ ActionRunningNotStarted=Não Iniciado
 ActionRunningShort=Em progresso
 ActionDoneShort=Terminado
 ActionUncomplete=Incompleta
-LatestLinkedEvents=Latest %s linked events
+LatestLinkedEvents=Os últimos %s eventos relacionados
 CompanyFoundation=Empresa/Organização
 ContactsForCompany=Contactos para este terceiro
 ContactsAddressesForCompany=Contactos/moradas para este terceiro
@@ -471,7 +473,7 @@ Discount=Desconto
 Unknown=Desconhecido
 General=General
 Size=Tamanho
-OriginalSize=Original size
+OriginalSize=Tamanho original
 Received=Recebido
 Paid=Pago
 Topic=Assunto
@@ -598,7 +600,7 @@ Undo=Desfazer
 Redo=Refazer
 ExpandAll=Expandir tudo
 UndoExpandAll=Anular Expansão
-SeeAll=See all
+SeeAll=Ver todos
 Reason=Razão
 FeatureNotYetSupported=Funcionalidade ainda não suportada
 CloseWindow=Fechar Janela
@@ -608,6 +610,7 @@ SendByMail=Enviar por e-mail
 MailSentBy=Mail enviado por
 TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem
 SendAcknowledgementByMail=Enviar email de confirmação
+SendMail=Enviar e-mail
 EMail=E-mail
 NoEMail=Sem e-mail
 Email=Email
@@ -672,8 +675,8 @@ Page=Página
 Notes=Notas
 AddNewLine=Adicionar nova linha
 AddFile=Adicionar ficheiro
-FreeZone=Not a predefined product/service
-FreeLineOfType=Not a predefined entry of type
+FreeZone=Não é um produto/serviço predefinido
+FreeLineOfType=Não é uma entrada predefinida de tipo
 CloneMainAttributes=Copiar objeto com os seus atributos principais
 PDFMerge=PDF Merge
 Merge=Junção
@@ -720,9 +723,9 @@ LinkToIntervention=Associar a intervenção
 CreateDraft=Criar Rascunho
 SetToDraft=Voltar para o rascunho
 ClickToEdit=Clique para editar
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
+EditWithEditor=Editar com CKEditor
+EditWithTextEditor=Editar com editor de texto
+EditHTMLSource=Editar código-fonte HTML
 ObjectDeleted=%s objeto removido
 ByCountry=Por país
 ByTown=Por cidade
@@ -753,10 +756,10 @@ SaveUploadedFileWithMask=Guardar o ficheiro no servidor com o nome  "<strong>%s<
 OriginFileName=Nome do ficheiro original
 SetDemandReason=Definir fonte
 SetBankAccount=Definir Conta Bancária
-AccountCurrency=Account currency
+AccountCurrency=Moeda da conta
 ViewPrivateNote=Ver notas
 XMoreLines=%s linhas(s) ocultas
-ShowMoreLines=Show more lines
+ShowMoreLines=Mostre mais linhas
 PublicUrl=URL público
 AddBox=Adicionar Caixa
 SelectElementAndClick=Selecione um elemento e clique em %s
@@ -765,7 +768,7 @@ ShowTransaction=Mostrar transação
 GoIntoSetupToChangeLogo=Vá Início - Configurar - Empresa para alterar o logótipo ou vá a Início - Configurar - Exibir para ocultar.
 Deny=Negar
 Denied=Negada
-ListOf=List of %s
+ListOf=Lista de %s
 ListOfTemplates=Lista de modelos
 Gender=Género
 Genderman=Homem
@@ -773,7 +776,7 @@ Genderwoman=Mulher
 ViewList=Ver Lista
 Mandatory=Obrigatório
 Hello=Olá
-GoodBye=GoodBye
+GoodBye=Adeus
 Sincerely=Atenciosamente
 DeleteLine=Apagar a linha
 ConfirmDeleteLine=Tem a certeza que deseja eliminar esta linha?
@@ -799,25 +802,32 @@ GroupBy=Agrupar por...
 ViewFlatList=Vista de lista
 RemoveString=Remover texto '%s'
 SomeTranslationAreUncomplete=Algumas línguas podem estar apenas parcialmente traduzidas ou podem conter erros. Se detetar erros de tradução, pode ajudar na melhoria da tradução registando-se em <a href="https://transifex.com/projects/p/dolibarr/" target="_blank">https://transifex.com/projects/p/dolibarr/</a>.
-DirectDownloadLink=Direct download link (public/external)
-DirectDownloadInternalLink=Direct download link (need to be logged and need permissions)
-Download=Descarregar
+DirectDownloadLink=Link de download direto (público/externo)
+DirectDownloadInternalLink=Link de download direto (precisa de ter sessão iniciada e precisa de permissões)
+Download=Download
 ActualizeCurrency=Atualizar taxa de conversão da moeda
 Fiscalyear=Ano Fiscal
 ModuleBuilder=Construtor de módulos
 SetMultiCurrencyCode=Definir moeda
 BulkActions=Ações em massa
 ClickToShowHelp=Clique para mostrar o balão de ajuda
+Website=Site da Web
+WebSites=Websites
+ExpenseReport=Relatório de despesas
+ExpenseReports=Relatórios de despesas
 HR=RH
 HRAndBank=RH e Banco
 AutomaticallyCalculated=Calculado automaticamente
 TitleSetToDraft=Repôr para rascunho
 ConfirmSetToDraft=Tem a certeza que pretende repôr para o estado de Rascunho?
-ImportId=Import id
-Websites=Web sites
+ImportId=ID de importação
+Websites=Websites
 Events=Eventos
 EMailTemplates=Modelos de emails
-FileNotShared=File not shared to exernal public
+FileNotShared=Ficheiro não partilhado
+Project=Projeto
+Projects=Projetos
+Rights=Permissões
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
@@ -847,14 +857,14 @@ ShortThursday=Qui
 ShortFriday=Sex
 ShortSaturday=Sab
 ShortSunday=Dom
-SelectMailModel=Select an email template
+SelectMailModel=Selecione um modelo de e-mail
 SetRef=Definir referência
 Select2ResultFoundUseArrows=Foram encontrados alguns resultados. Utilize as setas para selecionar o desejado.
 Select2NotFound=Nenhum resultado encontrado
 Select2Enter=Introduza
 Select2MoreCharacter=ou mais caracteres
 Select2MoreCharacters=ou mais caracteres
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
+Select2MoreCharactersMore=<strong>Sintaxe de pesquisa:</strong><br><kbd><strong>|</strong></kbd><kbd> OR</kbd>(alb)<br><kbd><strong>*</strong></kbd><kbd>Qualquer caracter</kbd>(a*b)<br /><kbd><strong>^</strong></kbd><kbd>Começar com</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> Terminar com</kbd> (ab$)<br />
 Select2LoadingMoreResults=A carregar mais resultados...
 Select2SearchInProgress=Pesquisa em progresso...
 SearchIntoThirdparties=Terceiros
@@ -876,7 +886,7 @@ SearchIntoCustomerShipments=Expedições do cliente
 SearchIntoExpenseReports=Relatórios de despesas
 SearchIntoLeaves=Licenças
 CommentLink=Comentários
-NbComments=Number of comments
-CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
+NbComments=Número de comentários
+CommentPage=Espaço de comentários
+CommentAdded=Comentário adicionado
+CommentDeleted=Comentário eliminado
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 69baac7879e..3ed1991e80f 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Volume de negócios (para uma empresa) ou do Orçamento (para u
 DefaultAmount=Quantidade padrão de assinatura
 CanEditAmount=Visitante pode escolher / editar montante da sua subscrição
 MEMBER_NEWFORM_PAYONLINE=Ir a página de pagamento online integrado
-ByProperties=por categorias
-MembersStatisticsByProperties=Estatísticas do utilizador por categorias
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Taxa de IVA a utilizar para assinaturas
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 93bc6dc41ed..90405084427 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/pt_PT/multicurrency.lang b/htdocs/langs/pt_PT/multicurrency.lang
index 2d4cb44d1c7..98c0d823dda 100644
--- a/htdocs/langs/pt_PT/multicurrency.lang
+++ b/htdocs/langs/pt_PT/multicurrency.lang
@@ -4,17 +4,17 @@ ErrorAddRateFail=Erro na taxa adicionada
 ErrorAddCurrencyFail=Erro na moeda adicionada
 ErrorDeleteCurrencyFail=Erro na eliminação
 multicurrency_syncronize_error=Erro de sincronização: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate
-multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate)
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Usar a data do documento para encontrar a taxa de câmbio, em vez de usar a última taxa conhecida
+multicurrency_useOriginTx=Quando um objeto é criado a partir de outro, mantenha a taxa original do objeto de origem (caso contrário use a última taxa conhecida)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality<br>Get your <b>API key</b><br />If you use a free account you can't change the <b>currency source</b> (USD by default)<br />But if your main currency isn't USD you can use the <b>alternate currency source</b> to force you main currency<br /><br />You are limited at 1000 synchronizations per month
+CurrencyLayerAccount_help_to_synchronize=Você deve criar uma conta no site para usar esta funcionalidade<br>Obtenha sua <b>chave da API </b><br />Se você usar uma conta gratuita, não pode alterar a <b>fonte de moeda</b> (USD por defeito)<br />Mas se a sua moeda principal não for o USD, você pode usar uma <b>fonte de moeda alternativa </b>para forçar sua moeda principal<br /><br />Você está limitado a 1000 sincronizações por mês
 multicurrency_appId=Chave da API
 multicurrency_appCurrencySource=Fonte da moeda
-multicurrency_alternateCurrencySource=Alternate currency source
+multicurrency_alternateCurrencySource=Fonte de moeda alternativa
 CurrenciesUsed=Moedas usadas
 CurrenciesUsed_help_to_add=Adicione as diferentes moedas e taxas que você necessita de usar nos seus <b>orçamentos</b>, <b>encomendas</b>, etc.
 rate=taxa
 MulticurrencyReceived=Recebido, moeda original
 MulticurrencyRemainderToTake=Montante restante, moeda original
 MulticurrencyPaymentAmount=Montante do pagamento, moeda original
-AmountToOthercurrency=Amount To (in currency of receiving account)
+AmountToOthercurrency=Montante Para (na moeda da conta de recebimento)
diff --git a/htdocs/langs/pt_PT/paybox.lang b/htdocs/langs/pt_PT/paybox.lang
index aa1037b6839..5640da03730 100644
--- a/htdocs/langs/pt_PT/paybox.lang
+++ b/htdocs/langs/pt_PT/paybox.lang
@@ -10,7 +10,7 @@ ToComplete=A completar
 YourEMail=E-Mail de confirmação de pagamento
 Creditor=Beneficiario
 PaymentCode=Código de pagamento
-PayBoxDoPayment=Pay with Credit or Debit Card (Paybox)
+PayBoxDoPayment=Pagar com cartão de crédito ou débito (Paybox)
 ToPay=Emitir pagamento
 YouWillBeRedirectedOnPayBox=Você será redirecionado para a página Paybox não se esqueça de introduzir a informação do seu cartão de crédito
 Continue=Continuar
diff --git a/htdocs/langs/pt_PT/paypal.lang b/htdocs/langs/pt_PT/paypal.lang
index 7b8d27ee60e..e7332848ff2 100644
--- a/htdocs/langs/pt_PT/paypal.lang
+++ b/htdocs/langs/pt_PT/paypal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuração do módulo do PayPal
 PaypalDesc=Esta oferta módulo de páginas para permitir o pagamento em <a href="http://www.paypal.com" target="_blank">PayPal</a> pelos clientes. Isto pode ser utilizado para um pagamento livre ou para um pagamento por um objecto Dolibarr particular (factura, ordem, ...)
-PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal)
+PaypalOrCBDoPayment=Pagar com Paypal (Cartão de Crédito ou Paypal)
 PaypalDoPayment=Pague com Paypal
 PAYPAL_API_SANDBOX=Modo de teste / sandbox
 PAYPAL_API_USER=Nome de utilizador API
@@ -11,11 +11,11 @@ PAYPAL_SSLVERSION=Versão do Curl SSL
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta de pagamento "integral" (Cartão de Crédito + Paypal) ou apenas "Paypal"
 PaypalModeIntegral=Integral
 PaypalModeOnlyPaypal=Apenas Paypal
-ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page
+ONLINE_PAYMENT_CSS_URL=URL opcional da folha de estilo CSS na página de pagamento online
 ThisIsTransactionId=Esta é id. da transação: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Adicionar o url de pagamento Paypal quando enviar um documento por correio eletrónico
 PredefinedMailContentLink=Pode clicar na hiperligação segura abaixo para efetuar o seu pagamento (Paypal), se este ainda não tiver sido efetuado.\n\n%s\n\n
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
+YouAreCurrentlyInSandboxMode=Você está atualmente no modo %s "sandbox"
 NewOnlinePaymentReceived=Novo pagamento online recebido
 NewOnlinePaymentFailed=Novo pagamento em linha tentado, mas falhado
 ONLINE_PAYMENT_SENDEMAIL=Correio eletrónico para avisar depois de um pagamento (bem sucedido ou não)
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index edac29e8e41..1f2e78410de 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -20,22 +20,22 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accounting code (purchase)
-ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancyBuyCode=Código de contabilidade (compra)
+ProductAccountancySellCode=Código de contabilidade (venda)
 ProductOrService=Produto ou Serviço
 ProductsAndServices=Produtos e Serviços
 ProductsOrServices=Produtos ou Serviços
 ProductsOnSaleOnly=Products for sale only
 ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
+ProductsNotOnSell=Produtos não vendidos e não disponíveis para compra
 ProductsOnSellAndOnBuy=Produtos para compra e venda
 ServicesOnSaleOnly=Services for sale only
 ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
+ServicesNotOnSell=Serviços não à venda e não disponíveis para compra
 ServicesOnSellAndOnBuy=Serviços para compra e venda
-LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
+LastModifiedProductsAndServices=Os últimos %s produtos/serviços modificados
+LastRecordedProducts=Os últimos %s produtos registados
+LastRecordedServices=Os últimos %s serviços registados
 CardProduct0=Ficha de Produto
 CardProduct1=Ficha de Serviço
 Stock=Stock
@@ -66,12 +66,12 @@ CostPriceUsage=This value could be used for margin calculation.
 SoldAmount=Sold amount
 PurchasedAmount=Purchased amount
 NewPrice=Novo preço
-MinPrice=Min. selling price
+MinPrice=Preço de venda mínimo
 CantBeLessThanMinPrice=O preço de venda não pode ser inferior ao mínimo permitido para este produto ( %s sem impostos)
 ContractStatusClosed=Fechado
 ErrorProductAlreadyExists=Um produto com a referencia %s já existe.
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorrecto
-ErrorProductClone=There was a problem while trying to clone the product or service.
+ErrorProductClone=Ocorreu um problema ao tentar clonar o produto ou serviço.
 ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=Fornecedores
 SupplierRef=Ref. fornecedor
@@ -91,21 +91,21 @@ SetDefaultBarcodeType=Defina o tipo de código de barras
 BarcodeValue=Valor do código de barras
 NoteNotVisibleOnBill=Nota (Não é visivel as facturas, orçamentos, etc.)
 ServiceLimitedDuration=Sim o serviço é de Duração limitada :
-MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
+MultiPricesAbility=Vários segmentos de preços por produto/serviço (cada cliente enquadra-se num segmento)
 MultiPricesNumPrices=Nº de preços
-AssociatedProductsAbility=Activate the feature to manage virtual products
+AssociatedProductsAbility=Ative o recurso para gerir produtos virtuais
 AssociatedProducts=Produtos associados
 AssociatedProductsNumber=Nº de produtos associados
-ParentProductsNumber=Number of parent packaging product
+ParentProductsNumber=Número de produtos de embalagem fonte
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=Se 0, este produto não é um produto virtual
+IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto não é usado por nenhum produto virtual
 KeywordFilter=Filtro por Chave
 CategoryFilter=Filtro por categoría
 ProductToAddSearch=Procurar produtos a Adicionar
 NoMatchFound=Não foram encontrados resultados
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component of this virtual product/package
+ProductAssociationList=Lista de produtos/serviços que são componentes deste produto/pacote virtual
 ProductParentList=Lista de produtos e serviços com este produto como um componente
 ErrorAssociationIsFatherOfThis=Um dos produtos seleccionados é pai do produto em curso
 DeleteProduct=Eliminar um produto/serviço
@@ -120,7 +120,7 @@ ConfirmDeleteProductLine=Está seguro de querer eliminar esta linha de produto?
 ProductSpecial=Especial
 QtyMin=Qtd mínima
 PriceQtyMin=Preço para esta qt. mín. (s/ o desconto)
-VATRateForSupplierProduct=VAT Rate (for this supplier/product)
+VATRateForSupplierProduct=Taxa de IVA (para este fornecedor/produto)
 DiscountQtyMin=Desconto predefinido para a qt.
 NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto
 NoSupplierPriceDefinedForThisProduct=Nenhum Preço/Quant. Fornecedor definida para este produto
@@ -139,19 +139,19 @@ ListServiceByPopularity=Lista de serviços de popularidade
 Finished=Produto Manofacturado
 RowMaterial=Matéria Prima
 CloneProduct=Copie produto ou serviço
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
+ConfirmCloneProduct=Tem certeza de que deseja clonar este produto ou serviço <b>%s</b>?
 CloneContentProduct=Copie todas as principais informações do produto / serviço
 ClonePricesProduct=Copie principais informações e preços
-CloneCompositionProduct=Clone packaged product/service
+CloneCompositionProduct=Clonar produto/serviço embalado
 CloneCombinationsProduct=Clone product variants
 ProductIsUsed=Este produto é utilizado
 NewRefForClone=Ref. do novo produto / serviço
 SellingPrices=Selling prices
 BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Supplier prices
+CustomerPrices=Preços aos clientes
+SuppliersPrices=Preços dos fornecedores
 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs/Commodity/HS code
+CustomCode=Código de alfândega/mercadoria/SH
 CountryOrigin=País de origem
 Nature=Natureza
 ShortLabel=Short label
@@ -188,21 +188,21 @@ unitLM=Linear meter
 unitM2=Square meter
 unitM3=Cubic meter
 unitL=Liter
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=Modelo de referência do produto
+ServiceCodeModel=Modelo de referência de serviço
 CurrentProductPrice=Preço atual
-AlwaysUseNewPrice=Always use current price of product/service
+AlwaysUseNewPrice=Usar sempre o preço atual do produto/serviço
 AlwaysUseFixedPrice=Utilizar o preço fixo
-PriceByQuantity=Different prices by quantity
-PriceByQuantityRange=Quantity range
+PriceByQuantity=Preços diferentes por quantidade
+PriceByQuantityRange=Gama de quantidades
 MultipriceRules=Price segment rules
 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
 KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
 ### composition fabrication
-Build=Produce
-ProductsMultiPrice=Products and prices for each price segment
+Build=Produzir
+ProductsMultiPrice=Produtos e preços para cada segmento de preço
 ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
 ProductSellByQuarterHT=Products turnover quarterly before tax
 ServiceSellByQuarterHT=Services turnover quarterly before tax
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 71eccc35de3..5de28c68a71 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. do projeto
 ProjectRef=Ref. do Projeto
 ProjectId=Id. do Projeto
 ProjectLabel=Nome do Projeto
-Project=Projeto
-Projects=Projetos
 ProjectsArea=Área de Projetos
 ProjectStatus=Estado do projeto
 SharedProject=Toda a Gente
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Mostrar Projeto
+ShowTask=Ver tarefa
 SetProject=Definir Projeto
 NoProject=Nenhum projeto definido ou possuído
 NbOfProjects=Nr. de Projetos
@@ -77,6 +76,7 @@ Time=Tempo
 ListOfTasks=Lista de tarefas
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Ir para a lista de tarefas
+GanttView=Gantt View
 ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Abrir Projeto
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=contatos do Projeto
+TaskContact=Task contacts
 ActionsOnProject=Ações sobre o projeto
 YouAreNotContactOfProject=Não é um contato deste projeto privado
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Excluir o tempo gasto
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Ver também as tarefas não me atribuidas
 ShowMyTasksOnly=Ver só as tarefas que me foram atribuídas
-TaskRessourceLinks=Recursos
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
 NoTasks=Não existem tarefas para este projeto
 LinkedToAnotherCompany=Vinculado a Terceiros
@@ -135,7 +136,7 @@ ProjectReportDate=Change task dates according to new project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projetos e tarefas
 ProjectCreatedInDolibarr=Projeto %s criado
-ProjectModifiedInDolibarr=Project %s modified
+ProjectModifiedInDolibarr=Projeto %s, modificado
 TaskCreatedInDolibarr=%s tarefas criadas
 TaskModifiedInDolibarr=%s tarefas modificadas
 TaskDeletedInDolibarr=%s tarefas apagadas
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index 8ab275e1ce7..7b6b61bb19b 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contabilística usada para terceiros
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=A conta contabilidade definida na ficha do utilizador será usada apenas para o Livro Auxiliar de contabilidade. Este será usado para o Livro Razão e como valor padrão da contabilidade do Livro Auxiliar se a conta de contabilidade do utilizador não estiver definida.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta contabilística usada por defeito para despesas de pessoal
 Salary=Salário
 Salaries=Salários
@@ -13,3 +13,5 @@ TJM=Taxa diária média
 CurrentSalary=Salário atual
 THMDescription=Esse valor pode ser usado para calcular o custo do tempo consumido num projeto inserido pelos utilizadores, isto no caso de o módulo Projetos estiver a ser utilizado
 TJMDescription=Esse valor é atualmente serve apenas como informação e não é utilizado em qualquer cálculo
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/pt_PT/sms.lang b/htdocs/langs/pt_PT/sms.lang
index 368471b7a5a..07094489179 100644
--- a/htdocs/langs/pt_PT/sms.lang
+++ b/htdocs/langs/pt_PT/sms.lang
@@ -48,4 +48,4 @@ SmsInfoNumero= (Formato internacional exemplo: +33899701761)
 DelayBeforeSending=Atraso antes de enviar (minutos)
 SmsNoPossibleSenderFound=Nenhum operador disponível. Verifique a configuração do seu serviço SMS. 
 SmsNoPossibleRecipientFound=Nenhum alvo disponível. Verifique a configuração do seu provedor de SMS.
-DisableStopIfSupported=Disable STOP message (if supported)
+DisableStopIfSupported=Desativar mensagem STOP (se suportado)
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 1d75c450737..1bf83f76431 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movimentos
 ErrorWarehouseRefRequired=O nome de referencia do armazem é obrigatório
 ListOfWarehouses=Lista de Armazens
 ListOfStockMovements=Lista de movimentos de stock
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movimento ou código do inventário
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=O stock pode ser negativo
diff --git a/htdocs/langs/pt_PT/stripe.lang b/htdocs/langs/pt_PT/stripe.lang
index 82efb8b3a61..03bc1fece09 100644
--- a/htdocs/langs/pt_PT/stripe.lang
+++ b/htdocs/langs/pt_PT/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuração do módulo Stripe
-StripeDesc=This module offer pages to allow payment on <a href="http://www.stripe.com" target="_blank">Stripe</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Este módulo disponibiliza páginas para permitir o pagamento por <a href="http://www.stripe.com" target="_blank"> Stripe </a> pelos clientes. Isto pode ser usado para um pagamento gratuito ou para um pagamento em um determinado objeto Dolibarr (fatura, encomenda, ...)
 StripeOrCBDoPayment=Pagar com cartão de crédito ou Stripe
 FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponiveis para permitir a um cliente efectuar um pagamento
 PaymentForm=Forma de pagamento
@@ -12,7 +12,7 @@ YourEMail=E-Mail de confirmação de pagamento
 STRIPE_PAYONLINE_SENDEMAIL=Correio eletrónico para avisar depois de um pagamento (bem sucedido ou não)
 Creditor=Beneficiario
 PaymentCode=Código de pagamento
-StripeDoPayment=Pay with Credit or Debit Card (Stripe)
+StripeDoPayment=Pagar com cartão de crédito ou débito (Stripe)
 YouWillBeRedirectedOnStripe=Você será redirecionado para uma página segura do Stripe de forma a inserir as informações do seu cartão de crédito
 Continue=Continuar
 ToOfferALinkForOnlinePayment=URL para o pagamento %s
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index 26f46cc7961..a454523db1b 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -14,7 +14,7 @@ TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Alguns sub-produtos não têm preço definido
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
-SupplierPrices=Supplier prices
+SupplierPrices=Preços dos fornecedores
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Este fornecedor de referência já está associado com uma referência: %s
 NoRecordedSuppliers=Sem Fornecedores Registados
 SupplierPayment=Pagamento a Fornecedor
@@ -43,4 +43,4 @@ NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-BuyingPriceNumShort=Supplier prices
+BuyingPriceNumShort=Preços dos fornecedores
diff --git a/htdocs/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang
index d7816ea0bdf..9a48dc7f02b 100644
--- a/htdocs/langs/pt_PT/trips.lang
+++ b/htdocs/langs/pt_PT/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Relatório de despesas
-ExpenseReports=Relatórios de despesas
 ShowExpenseReport=Show expense report
 Trips=Relatórios de Despesas
 TripsAndExpenses=Relatório de Despesas
@@ -12,6 +10,8 @@ ListOfFees=Lista de Taxas
 TypeFees=Tipos de taxas
 ShowTrip=Show expense report
 NewTrip=Novo relatório de despesas
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Quantidade de Quilómetros
 DeleteTrip=Apagar relatório de despesas
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Número do intervalo predefinido
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index 98c235be1ae..cc53ff06f3f 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -96,11 +96,11 @@ HierarchicView=Visualização Hierárquica
 UseTypeFieldToChange=Utilize o Tipo de Campo para alterar
 OpenIDURL=URL de OpenID
 LoginUsingOpenID=Utilizar OpenID para iniciar a sessão
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected worked hours per week
+WeeklyHours=Horas de trabalho (por semana)
+ExpectedWorkedHours=Horas de trabalho esperadas por semana
 ColorUser=Cor do utilizador
 DisabledInMonoUserMode=Desativado no modo de manutenção
-UserAccountancyCode=User accounting code
+UserAccountancyCode=Código de contabilidade do utilizador
 UserLogoff=Terminar sessão do utilizador
 UserLogged=Utilizador conectado
 DateEmployment=Data de contratação
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 93976eceacc..91e78328ff7 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Eliminar site da Web
 ConfirmDeleteWebsite=Tem a certeza que deseja eliminar este site da Web. Também irão ser removidos todas as suas páginas e conteúdo.
 WEBSITE_PAGENAME=Nome/pseudonimo da página
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL do ficheiro CSS externo
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Editar Menu
 EditMedias=Edit medias
 EditPageMeta=Editar Metadados
-Website=Site da Web
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 0bbb6f5e487..1a62921c38a 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignorați erorile de înregistrare duplicat (INSERT IGNOR
 AutoDetectLang=Autodetect (browser limbă)
 FeatureDisabledInDemo=Funcţonalitate dezactivată în demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permisiuni
 BoxesDesc=Widgeturile sunt componente care prezintă unele informații pe care le puteți adăuga pentru a personaliza unele pagini. Aveți posibilitatea să alegeți între afișarea widget-ului sau nu, selectând pagina țintă și făcând clic pe "Activare" sau făcând clic pe coșul de gunoi pentru a-l dezactiva.
 OnlyActiveElementsAreShown=Numai elementele din <a href="%s"> module activate </a> sunt afişate.
 ModulesDesc=Modulele Dolibarr definesc ce aplicație / caracteristică este activată în software. Unele aplicații / module necesită permisiuni pe care trebuie să le acordați utilizatorilor, după activarea acestora. Faceți clic pe butonul On / Off pentru a activa un modul / aplicație.
@@ -593,7 +592,7 @@ Module5000Desc=Vă permite să administraţi mai multe companii
 Module6000Name=Flux de lucru
 Module6000Desc=Managementul fluxului de lucru
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Managementul cererilor de concedii
 Module20000Desc=Declară şi urmăreşte cererile de concedii ale angajaţilor
 Module39000Name=Lot Produs
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Functionalitate pentru a trimite mesaje utilizân
 TranslationSetup=Configurarea traducerii
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=Cum se configureaza limbajul de aplicație afișat: <br> * Sistem: meniu <strong> Acasă - Configurare - Afișare </strong> <br> Per utilizator: <strong> Configurare afișare utilizator </strong> Tab-ul cardului utilizatorului (apasati pe numele de utilizator din partea de sus a ecranului).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Regulă pentru a genera parole sugerate sau validareal
 DisableForgetPasswordLinkOnLogonPage=Nu afişa link-ul "Uită parola" de pe pagina de login
 UsersSetup=Utilizatorii modul de configurare
 UserMailRequired=EMail necesare pentru a crea un utilizator nou
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=Configurare Modul HRM
 ##### Company setup #####
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index 8c5ef7332bb..1f250411105 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -70,3 +70,9 @@ Stats=Statistici vânzări
 StatusProsp=Statut Prospect
 DraftPropals=Oferte Comerciale Schiţă
 NoLimit=Nelimitat 
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index 12138405a2b..ce65ca53ebe 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Anulare cerere concediu
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 77c0f313ec7..989fb17296e 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unic de contact din companii
 MailNoChangePossible=Destinatari validate de email-uri nu poate fi schimbat
 SearchAMailing=Căutare de e-mail
 SendMailing=Trimite email-uri
-SendMail=Trimite un email
 SentBy=Trimis de
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Puteţi, totuşi, trimite-le on-line, prin adăugarea parametrului MAILING_LIMIT_SENDBYWEB cu valoare de numărul maxim de mesaje de poştă electronică pe care doriţi să o trimiteţi prin sesiuni.
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 8feb24b9587..50b4ff96224 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Data aprobare (a doua aprobare)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=an
 DurationMonth=lună
 DurationWeek=săptămână
@@ -608,6 +610,7 @@ SendByMail=Trimite prin e-mail
 MailSentBy=E-mail trimis de
 TextUsedInTheMessageBody=Continut Email
 SendAcknowledgementByMail=Trimite confirmare email
+SendMail=Trimite un email
 EMail=E-mail
 NoEMail=Niciun email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Raport Cheltuieli
+ExpenseReports=Rapoarte Cheltuieli
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Evenimente
 EMailTemplates=Șabloane e-mailuri 
 FileNotShared=File not shared to exernal public
+Project=Proiect
+Projects=Proiecte
+Rights=Permisiuni
 # Week day
 Monday=Luni
 Tuesday=Marţi
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 46dd311ce95..effde2c0d4f 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Cifra de afaceri (pentru o companie), sau Bugetul (pentru o fun
 DefaultAmount=Valoarea implicită a cotizaţiei
 CanEditAmount=Vizitatorul poate alege / modifica valoarea cotizaţiei sale
 MEMBER_NEWFORM_PAYONLINE=Mergi la pagina integrată de plata online
-ByProperties=După caracteristici
-MembersStatisticsByProperties=Statistici Membri după caracteristici
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Acest ecran va afiseaza statisticile pe membrii dupa forma juridica
 MembersByRegion=Acest ecran va afiseaza statisticile pe membrii dupa regiune.
 VATToUseForSubscriptions=Rata TVA utilizată pentru înscrieri
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index 60aa8b87f94..48a9f5a2502 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index c2af6806a25..1e5305bb581 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. proiect
 ProjectRef=Project ref.
 ProjectId=ID proiect
 ProjectLabel=Project label
-Project=Proiect
-Projects=Proiecte
 ProjectsArea=Projects Area
 ProjectStatus=Statut Proiect
 SharedProject=Toată lumea
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Afişează proiect
+ShowTask=Arată sarcină
 SetProject=Setare proiect
 NoProject=Niciun proiect definit sau responsabil
 NbOfProjects=Nr proiecte
@@ -77,6 +76,7 @@ Time=Timp
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Lista oferte comerciale asociate la proiect
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Redeschide Proiect
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Contacte Proiect
+TaskContact=Task contacts
 ActionsOnProject=Evenimente pe proiect
 YouAreNotContactOfProject=Nu sunteţi un contact al acestui proiect privat
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Ştergeţi timpul  consumat
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Afişează, de asemenea, şi taskurile ce nu sunt atribuite mie
 ShowMyTasksOnly=Vezi numai taskurile atribuite mie
-TaskRessourceLinks=Resurse
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ
 NoTasks=Nr sarcini pentru acest proiect
 LinkedToAnotherCompany=Legat de terţe părţi, alta
diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index 9fdfff09105..e4cc3ef6dcb 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Salariu curent
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 634d2cc40b8..3dcaecfbaea 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -22,6 +22,7 @@ Movements=Mişcări
 ErrorWarehouseRefRequired=Referința  Depozit este obligatorie
 ListOfWarehouses=Lista  depozite
 ListOfStockMovements=Lista mişcări de stoc
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Depozite
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Eticheta transferului
+DateMovement=Date of movement
 InventoryCode=Codul de inventar sau transfer
 IsInPackage=Continute in pachet
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
index 7f343c437be..66b6c73f760 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Raport Cheltuieli
-ExpenseReports=Rapoarte Cheltuieli
 ShowExpenseReport=Show expense report
 Trips=Rapoarte Cheltuieli
 TripsAndExpenses=Rapoarte Cheltuieli
@@ -12,6 +10,8 @@ ListOfFees=Lista note cheltuieli
 TypeFees=Tipuri taxe
 ShowTrip=Show expense report
 NewTrip= Raport de cheltuieli nou
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Valoarea  sau km
 DeleteTrip=Șterge raport de cheltuieli
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Ați declarat un alt raport de cheltuieli într-un interval de timp similar.
 AucuneLigne=Nu există încă nici un raport de cheltuieli declarate 
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 01ff65b3ba4..a0e5db8d16e 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Şterge website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Pagina nume/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit meniu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 98e86ceb626..6515e1c3c98 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords= Игнорировать ошибки дублирующ
 AutoDetectLang=Автоопределение (язык браузера)
 FeatureDisabledInDemo=Функция отключена в демо -
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Права
 BoxesDesc=Виджеты компонентов отображают такую же информацию которую вы можете добавить к персонализированным страницам. Вы можете выбрать между показом виджета или не выбирая целевую страницу нажать "Активировать", или выбрать корзину для отключения.
 OnlyActiveElementsAreShown=Показаны только элементы из <a href="%s">включенных модулей</a>
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Управление группами компаний
 Module6000Name=Бизнес-Процесс
 Module6000Desc=Управление рабочим процессом
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Заявления на отпуск
 Module20000Desc=Управление заявлениями на отпуск и соблюдение графика отпусков работниками
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Правило предложили генериров
 DisableForgetPasswordLinkOnLogonPage=Не показывать ссылку "Забыли пароль" на странице входа
 UsersSetup=Пользователь модуля установки
 UserMailRequired=EMail, необходимые для создания нового пользователя
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang
index 9a7a8dd4769..b495758d3cc 100644
--- a/htdocs/langs/ru_RU/commercial.lang
+++ b/htdocs/langs/ru_RU/commercial.lang
@@ -70,3 +70,9 @@ Stats=Статистика продаж
 StatusProsp=Проспект статус
 DraftPropals=Проект коммерческих предложений
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 79a5d0c720d..3a68f473b56 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Отмена заявления на отпуск
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 51fddb30559..d91b8389519 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Уникальный контактов компаний
 MailNoChangePossible=Получатели для подтверждена электронной почте не может быть изменен
 SearchAMailing=Поиск рассылку
 SendMailing=Отправить по электронной почте
-SendMail=Отправить письмо
 SentBy=Прислал
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Однако вы можете отправить их в Интернете, добавив параметр MAILING_LIMIT_SENDBYWEB с величиной максимальное количество писем вы хотите отправить на сессии.
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index be811b3db3f..a8468b9e958 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Дата утверждения (повторного)
 RegistrationDate=Registration date
 UserCreation=Создание пользователя
 UserModification=Изменение пользователя
+UserValidation=Validation user
 UserCreationShort=Создан. пользователь
 UserModificationShort=Измен. пользователь
+UserValidationShort=Valid. user
 DurationYear=год
 DurationMonth=месяц
 DurationWeek=неделя
@@ -608,6 +610,7 @@ SendByMail=Отправить по электронной почте
 MailSentBy=Отправлено по Email
 TextUsedInTheMessageBody=Текст Email
 SendAcknowledgementByMail=Отправить подтверждение на электронную почту
+SendMail=Отправить письмо
 EMail=Электронная почта
 NoEMail=Нет Email
 Email=Адрес электронной почты
@@ -808,6 +811,10 @@ ModuleBuilder=Создатель Модуля
 SetMultiCurrencyCode=Настройка валюты
 BulkActions=Массовые действия
 ClickToShowHelp=Нажмите для отображения подсказок
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Отчёт о затратах
+ExpenseReports=Отчёты о затратах
 HR=Кадры
 HRAndBank=Кадры и Банк
 AutomaticallyCalculated=Автоматический подсчет
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=События
 EMailTemplates=Шаблоны электронных писем
 FileNotShared=File not shared to exernal public
+Project=Проект
+Projects=Проекты
+Rights=Права доступа
 # Week day
 Monday=Понедельник
 Tuesday=Вторник
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 22808d15707..9a09a2bcfcf 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Оборот (за компанию) или бюджета (з
 DefaultAmount=По умолчанию количество подписки
 CanEditAmount=Посетитель может выбрать / изменить размер его подписке
 MEMBER_NEWFORM_PAYONLINE=Перейти по комплексному интернет страницу оплаты
-ByProperties=По характеристикам
-MembersStatisticsByProperties=Стастистика участников по характеристикам
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Значение НДС, для ипользования в подписках
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index cec37a458cc..acd983b84a9 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. проект
 ProjectRef=Project ref.
 ProjectId=ID Проекта
 ProjectLabel=Project label
-Project=Проект
-Projects=Проекты
 ProjectsArea=Projects Area
 ProjectStatus=Статус проекта
 SharedProject=Общий проект
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Показать проекта
+ShowTask=Показать задачу
 SetProject=Комплекс проектов
 NoProject=Нет проекта определена
 NbOfProjects=Nb проектов
@@ -77,6 +76,7 @@ Time=Время
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Списки коммерческих предложений, связанных с проектом
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Открытый проект
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Проект контакты
+TaskContact=Task contacts
 ActionsOnProject=Действия по проекту
 YouAreNotContactOfProject=Вы не контакт этого частного проекта
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Удалить времени
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Также видеть  задачи, не назначенные мне
 ShowMyTasksOnly=Видеть только задачи, назначенные мне
-TaskRessourceLinks=Ресурсы
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Проектов, посвященных этой третьей стороне
 NoTasks=Нет задач, для этого проекта
 LinkedToAnotherCompany=Связь с другими третий участник
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index 2bf334f2ae4..ebc439a3e65 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Текущая зарплата
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 76e36c38570..03bc9531bb7 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -22,6 +22,7 @@ Movements=Перевозкой
 ErrorWarehouseRefRequired=Склад ссылкой зовут требуется
 ListOfWarehouses=Список складов
 ListOfStockMovements=Список акций движения
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Раздел "Склад"
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index cd71eeb2844..d9c5113cebd 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Отчёт о затратах
-ExpenseReports=Отчёты о затратах
 ShowExpenseReport=Show expense report
 Trips=Отчёты о затратах
 TripsAndExpenses=Отчёты о затратах
@@ -12,6 +10,8 @@ ListOfFees=Список сборов
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=Новый отчёт о затртатах
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Сумма или километры
 DeleteTrip=Удалить отчёт о затратах
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Вы должны задекларировать другой отчёт о затратах в этом временном диапазоне. 
 AucuneLigne=Нет задекларированных отчётов о затратах
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index 82318510ead..7e4688eeb24 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 81594a6ce3c..2d2bfd11168 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignorovať chyby duplicitného záznamu
 AutoDetectLang=Autodetekcia (jazyk prehliadača)
 FeatureDisabledInDemo=Funkcia zakázaný v demo
 FeatureAvailableOnlyOnStable=Táto možnosť je dostupná iba v oficiálnej stabilnej verzií
-Rights=Oprávnenie
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Iba prvky z <a href="%s">povolených modulov</a> sú uvedené.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Umožňuje spravovať viac spoločností
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Web stránky
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Opustiť správcu požiadaviek
 Module20000Desc=Deklarovať a sledovať zamestnanci opustí požiadavky
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Nastavenie prekladu
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Preprísať prekladový reľazec
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Prekladový reťazec
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Pravidlo pre generovanie hesiel navrhovaná alebo over
 DisableForgetPasswordLinkOnLogonPage=Nezobrazovať na odkaz &quot;Zabudli ste heslo&quot; na prihlasovacej stránke
 UsersSetup=Užívatelia modul nastavenia
 UserMailRequired=EMail nutné vytvoriť nového užívateľa
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/sk_SK/commercial.lang b/htdocs/langs/sk_SK/commercial.lang
index 4f3f652660e..a43f4dbdc4b 100644
--- a/htdocs/langs/sk_SK/commercial.lang
+++ b/htdocs/langs/sk_SK/commercial.lang
@@ -70,3 +70,9 @@ Stats=Predajné štatistiky
 StatusProsp=Prospect stav
 DraftPropals=Navrhnúť obchodné návrhy
 NoLimit=Bez limitu
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
index d981c5a1b2e..90da146dda5 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 755148a2910..7421b38d596 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unikátny kontakty / adresy
 MailNoChangePossible=Príjemcovia pre validované rozosielanie nemožno zmeniť
 SearchAMailing=Hľadať mailing
 SendMailing=Poslať e-mailom
-SendMail=Odoslať e-mail
 SentBy=Odosielateľ:
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Však môžete zaslať on-line pridaním parametra MAILING_LIMIT_SENDBYWEB s hodnotou max počet e-mailov, ktoré chcete poslať zasadnutí. K tomu, prejdite na doma - Nastavenie - Ostatné.
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 7d516479621..e84d1765fd1 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=rok
 DurationMonth=mesiac
 DurationWeek=týždeň
@@ -608,6 +610,7 @@ SendByMail=Poslať e-mailom
 MailSentBy=E-mail zaslaná
 TextUsedInTheMessageBody=E-mail telo
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Odoslať e-mail
 EMail=E-mail
 NoEMail=Žiadny e-mail
 Email=E-mail
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web stránka
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Udalosti
 EMailTemplates=Šablóny emailov
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projekty
+Rights=Oprávnenia
 # Week day
 Monday=Pondelok
 Tuesday=Utorok
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index 7ba5be496b9..ecd2b64a1e9 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Obrat (pre firmu), alebo rozpočet (pre nadáciu)
 DefaultAmount=Východisková suma predplatného
 CanEditAmount=Návštevník si môže vybrať / upraviť výšku svojho upísaného
 MEMBER_NEWFORM_PAYONLINE=Prejsť na integrované on-line platobné stránky
-ByProperties=Charakteristikami
-MembersStatisticsByProperties=Členovia štatistiky podľa charakteristík
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Tento pohľad zobrazuje štatistiky používateľov podľa krajiny
 MembersByRegion=Tento pohľad zobrazuje štatistiky používateľov podľa regiónu
 VATToUseForSubscriptions=Sadzba DPH sa má použiť pre predplatné
diff --git a/htdocs/langs/sk_SK/modulebuilder.lang b/htdocs/langs/sk_SK/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/sk_SK/modulebuilder.lang
+++ b/htdocs/langs/sk_SK/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 41d78f6f336..eca6eb0915a 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Projekt
-Projects=Projekty
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Všetci
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Zobraziť projektu
+ShowTask=Zobraziť úloha
 SetProject=Nastavenie projektu
 NoProject=Žiadny projekt definovaný alebo vlastné
 NbOfProjects=Nb projektov
@@ -77,6 +76,7 @@ Time=Čas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Zoznam obchodných návrhov spojených s projektom
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Otvoriť projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kontakty
+TaskContact=Task contacts
 ActionsOnProject=Udalosti na projekte
 YouAreNotContactOfProject=Nie ste kontakt tomto súkromnom projekte
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Odstrániť čas strávený
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Zdroje
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekty venovaný tejto tretej osobe
 NoTasks=Žiadne úlohy tohto projektu
 LinkedToAnotherCompany=Súvisí s tretej strane
diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang
index 698984051b4..d7579b24bef 100644
--- a/htdocs/langs/sk_SK/salaries.lang
+++ b/htdocs/langs/sk_SK/salaries.lang
@@ -13,3 +13,5 @@ TJM=priemerná denná mzda
 CurrentSalary=Súčasná mzda
 THMDescription=Táto hodnota môže byť použitá pre výpočet ceny času stráveného na projekte užívateľom ak modul Projekt je použitý
 TJMDescription=Táto hoidnota je iba informačná a nie je použitá pre kalkulácie
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 68b887da38a..f2866824b90 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -22,6 +22,7 @@ Movements=Pohyby
 ErrorWarehouseRefRequired=Referenčné meno skladu je povinné
 ListOfWarehouses=Zoznam skladov
 ListOfStockMovements=Zoznam skladových pohybov
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Oblasť skladov
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Výška zásov musí byť dostatočná pre pridanie
 StockMustBeEnoughForOrder=Výška zásov musí byť dostatočná pre pridanie produktu/služby do objednávky ( kontrolujú sa aktuálne skutočné zásoby pri pridávaní riadku na faktúru ak keď je nastavené pravidlo pre automatickú zmenu zásob )
 StockMustBeEnoughForShipment= Výška zásov musí byť dostatočná pre pridanie produktu/služby do zásielky ( kontrolujú sa aktuálne skutočné zásoby pri pridávaní riadku na faktúru ak keď je nastavené pravidlo pre automatickú zmenu zásob )
 MovementLabel=Štítok pohybu
+DateMovement=Date of movement
 InventoryCode=Presun alebo skladový kód
 IsInPackage=Vložené do balíka
 WarehouseAllowNegativeTransfer=Zásoby môžu byť mínusové
diff --git a/htdocs/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang
index 6f350c03670..c3aee29c971 100644
--- a/htdocs/langs/sk_SK/trips.lang
+++ b/htdocs/langs/sk_SK/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Sadzobník poplatkov
 TypeFees=Poplatky
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Množstvo alebo kilometrov
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index 9d22f4cd8a2..393861ec5da 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Zmazať webstránku
 ConfirmDeleteWebsite=Určite chcete zmazať túto web stránku. Všetky podstránka a obsah budú zmazané tiež.
 WEBSITE_PAGENAME=Meno stránky
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL alebo externý CSS dokument
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Upraviť menu
 EditMedias=Edit medias
 EditPageMeta=Upraviť Meta
-Website=Web stránka
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 520f2c22d74..26cc871fbdc 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Samozaznava (jezik iskalnika)
 FeatureDisabledInDemo=Funkcija onemogočena v demo različici
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Dovoljenja
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Prikazani so samo elementi <a href="%s">omogočenih modulov </a>.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Omogoča upravljaje skupine podjetij
 Module6000Name=Potek dela
 Module6000Desc=Upravljanje poteka dela
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Upravljanje zahtevkov za dopust
 Module20000Desc=Določitev in sledenje zahtevkov za dopustov zaposlenih
 Module39000Name=Lot proizvoda
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Funkcija za pošiljanje pošte z uporabo metode "
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Pravilo za generiranje predlaganih gesel ali potrjevan
 DisableForgetPasswordLinkOnLogonPage=Ne prikazuj povezave "Ste pozabili geslo?" na strani za prijavo
 UsersSetup=Nastavitve modula uporabnikov
 UserMailRequired=Za kreiranje novega uporabnika je zahtevan EMail naslov
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/sl_SI/commercial.lang b/htdocs/langs/sl_SI/commercial.lang
index dbb4506be1f..596205ed0b1 100644
--- a/htdocs/langs/sl_SI/commercial.lang
+++ b/htdocs/langs/sl_SI/commercial.lang
@@ -70,3 +70,9 @@ Stats=Statistika prodaje
 StatusProsp=Status možne stranke
 DraftPropals=Osnutek komercialne ponudbe
 NoLimit=Brez omejitev
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index 831e30f9248..ad7f4d8208d 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Preklic zahtevka za dopust
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index cc806d5f445..b13a4064e02 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Enolični kontakti podjetij
 MailNoChangePossible=Prejemnikov za potrjeno e-sporočilo ne morete spremeniti
 SearchAMailing=Iskanje e-pošte
 SendMailing=Pošiljanje e-pošte
-SendMail=Pošlji e-pošto
 SentBy=Poslal
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Lahko jih seveda pošljete tudi »online«, če dodate parameter MAILING_LIMIT_SENDBYWEB z največjim številom e-sporočil, ki jih želite poslati v eni seji.
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index f0d0677e9b2..3c9d0c5fc53 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Datum odobritve (drugi nivo)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=leto
 DurationMonth=mesec
 DurationWeek=teden
@@ -608,6 +610,7 @@ SendByMail=Pošlji EMail
 MailSentBy=Email poslal
 TextUsedInTheMessageBody=Vsebina Email-a
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Pošlji e-pošto
 EMail=E-pošta
 NoEMail=Ni email-a
 Email=E-pošta
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Stroškovna poročila
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Dogodki
 EMailTemplates=Predloge za elektronsko pošto
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projekti
+Rights=Dovoljenja
 # Week day
 Monday=Ponedeljek
 Tuesday=Torek
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 37672eb1d16..610eb155d3d 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Obseg prodaje (za podjetje) ali proračun (za fundacijo)
 DefaultAmount=Privzeti znesek za članarine
 CanEditAmount=Obiskovalec lahko izbere/ureja znesek svoje članarine
 MEMBER_NEWFORM_PAYONLINE=Skoči na integrirano stran za online plačila
-ByProperties=Po lastnostih
-MembersStatisticsByProperties=Statistika članov po lastnostih
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Na tem zaslonu je prikazana statistika članov po lastnostih.
 MembersByRegion=Na tem zaslonu je prikazana statistika članov po regijah.
 VATToUseForSubscriptions=Stopnja DDV za naročnine
diff --git a/htdocs/langs/sl_SI/modulebuilder.lang b/htdocs/langs/sl_SI/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/sl_SI/modulebuilder.lang
+++ b/htdocs/langs/sl_SI/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 5892137ece9..0a7eb58b74a 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Id projekta
 ProjectLabel=Project label
-Project=Projekt
-Projects=Projekti
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Projekti v skupni rabi
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Prikaži projekt
+ShowTask=Prikaži naloge
 SetProject=Nastavi projekt
 NoProject=Nimate definiranega ali lastnega projekta
 NbOfProjects=Število projektov
@@ -77,6 +76,7 @@ Time=Čas
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Seznam komercialnih ponudb, povezanih s projektom
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Odprite projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti za projekt
+TaskContact=Task contacts
 ActionsOnProject=Aktivnosti o projektu
 YouAreNotContactOfProject=Niste kontakt tega privatnega projekta
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Izbrišite porabljen čas
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Viri
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekti, ki so povezani s tem partnerjem
 NoTasks=Ni nalog za ta projekt
 LinkedToAnotherCompany=Povezane z drugimi partnerji
diff --git a/htdocs/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang
index b376b9e755f..cc234ebbdb1 100644
--- a/htdocs/langs/sl_SI/salaries.lang
+++ b/htdocs/langs/sl_SI/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Trenutna plača
 THMDescription=Ta kalkulacija se lahko uporabi za izračun stroškov porabljenega časa na projektu, ki ga vnese uporabnik, če je uporabljen projektni modul
 TJMDescription=Ta vrednost je trenutno samo informativna in se ne uporablja v nobeni kalkulaciji
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index ed63cad763b..9c297207030 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -22,6 +22,7 @@ Movements=Gibanja
 ErrorWarehouseRefRequired=Obvezno je referenčno ime skladišča
 ListOfWarehouses=Spisek skladišč
 ListOfStockMovements=Seznam gibanja zaloge
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Področje skladišč
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Nalepka gibanja
+DateMovement=Date of movement
 InventoryCode=Koda gibanja ali zaloge
 IsInPackage=Vsebina paketa
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/sl_SI/trips.lang b/htdocs/langs/sl_SI/trips.lang
index 25a1956d538..149b13e872b 100644
--- a/htdocs/langs/sl_SI/trips.lang
+++ b/htdocs/langs/sl_SI/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Stroškovna poročila
 ShowExpenseReport=Show expense report
 Trips=Stroškovna poročila
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Seznam stroškov
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Količina kilometrov
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index f18b00cbfb3..18d8fa78513 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Izbriši spletno stran
 ConfirmDeleteWebsite=Ali ste prepričani, da želite izbrisati to spletno starn. Vse strani in vsebina bodo pobrisani.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 3f49ad36ccc..5efe3f690ad 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/sq_AL/commercial.lang b/htdocs/langs/sq_AL/commercial.lang
index eaa4b69e60b..5c8e31d5061 100644
--- a/htdocs/langs/sq_AL/commercial.lang
+++ b/htdocs/langs/sq_AL/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index b373d4d7852..be527631e06 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 091639da0b6..bee9ca1f74a 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 94a4b322d15..8985387e77e 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index c084e65027e..e8babaa966c 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index edf8f36f69a..a057fae4e18 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/sq_AL/salaries.lang
+++ b/htdocs/langs/sq_AL/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 6316f34b1ce..62d8979b43a 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang
index 17ed0365c5c..2a22428fb35 100644
--- a/htdocs/langs/sq_AL/trips.lang
+++ b/htdocs/langs/sq_AL/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 3655619705f..008664f11f2 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=Podešavanja HRM modula
 ##### Company setup #####
diff --git a/htdocs/langs/sr_RS/commercial.lang b/htdocs/langs/sr_RS/commercial.lang
index 5142c8d1edf..a42ce49afc4 100644
--- a/htdocs/langs/sr_RS/commercial.lang
+++ b/htdocs/langs/sr_RS/commercial.lang
@@ -70,3 +70,9 @@ Stats=Statistika prodaje
 StatusProsp=Status prospekta
 DraftPropals=Nacrt komercijalne ponude
 NoLimit=Bez limita
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sr_RS/holiday.lang b/htdocs/langs/sr_RS/holiday.lang
index 46995d3ac00..5f1a64c53d9 100644
--- a/htdocs/langs/sr_RS/holiday.lang
+++ b/htdocs/langs/sr_RS/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Napusti otkazivanje zahteva
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index 3aba0bbec76..1cd866cee56 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Jedinstveni kontakti/adrese
 MailNoChangePossible=Primaoci za odobrene emailinge ne mogu biti izmenjeni
 SearchAMailing=Pretraži emailing
 SendMailing=Pošalji emailing
-SendMail=Pošalji email
 SentBy=Poslao
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Možete ih poslati i online, dodavanjem parametra MAILING_LIMIT_SENDBYWEB sa vrednošću maksimalnog broja mailova koje želite da pošaljete u jednoj sesiji. Pogledajte Home - Podešavanja - Ostalo.
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index f84de54e948..67438d67c76 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Vreme odobravanja (drugo odobrenje)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=godina
 DurationMonth=mesec
 DurationWeek=nedelja
@@ -608,6 +610,7 @@ SendByMail=Poslato mailom
 MailSentBy=Mail poslao
 TextUsedInTheMessageBody=Sadržaj maila
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Pošalji email
 EMail=E-mail
 NoEMail=Nema maila
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Trošak
+ExpenseReports=Troškovi
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Događaj
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Projekat
+Projects=Projekti
+Rights=Prava
 # Week day
 Monday=Ponedeljak
 Tuesday=Utorak
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index 59464c879c8..b00f0d588d7 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Obrt (za kompaniju) ili budžet (za fondaciju)
 DefaultAmount=Default iznos pretplate
 CanEditAmount=Posetilac može da izabere/izmeni iznos svoje pretplate
 MEMBER_NEWFORM_PAYONLINE=Pređi na integrisanu online stranicu uplate
-ByProperties=Po karakteristikama
-MembersStatisticsByProperties=Statistike članova po karakteristikama
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Ovaj ekran prikazuje statistike članova po prirodi.
 MembersByRegion=Ovaj ekran prikazuje statistike članova po regionu.
 VATToUseForSubscriptions=PDV stopa za pretplate
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 33888620489..76e662ef03e 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. projekta
 ProjectRef=Ref. projekta
 ProjectId=ID projekta
 ProjectLabel=Naziv projekta
-Project=Projekat
-Projects=Projekti
 ProjectsArea=Zona projekata
 ProjectStatus=Status projekta
 SharedProject=Svi
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Količina prilika projekata na osnovu statusa
 ShowProject=Prikaži projekat
+ShowTask=Prikaži zadatak
 SetProject=Postavi projekat
 NoProject=Nema definisanih ni pripadajućih projekata
 NbOfProjects=Br projekata
@@ -77,6 +76,7 @@ Time=Vreme
 ListOfTasks=Lista zadataka
 GoToListOfTimeConsumed=Idi na listu utrošenog vremena
 GoToListOfTasks=Idi na listu zadataka
+GanttView=Gantt View
 ListProposalsAssociatedProject=Lista komercijalnih ponuda vezanih za projekat
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Otvori projekat
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Kontakti projekta
+TaskContact=Task contacts
 ActionsOnProject=Događaji projekta
 YouAreNotContactOfProject=Vi niste kontakt u ovom privatnom projektu
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Obriši provedeno vreme
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Prikaži zadatke koji mi nisu dodeljeni
 ShowMyTasksOnly=Prikaži samo moje zadatke
-TaskRessourceLinks=Resursi
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekti posvećeni ovom subjektu
 NoTasks=Nema zadataka za ovaj projekat
 LinkedToAnotherCompany=Subjekti vezani za ovaj projekat
diff --git a/htdocs/langs/sr_RS/salaries.lang b/htdocs/langs/sr_RS/salaries.lang
index 141655b70ad..b380d517d6f 100644
--- a/htdocs/langs/sr_RS/salaries.lang
+++ b/htdocs/langs/sr_RS/salaries.lang
@@ -13,3 +13,5 @@ TJM=Prosečna cena dana
 CurrentSalary=Trenutna plata
 THMDescription=Ova vrednost može biti korišćena za procenu cene vremena provedenog na projektu koje su korisnici uneli (ukoliko se koristi modul projekti)
 TJMDescription=Ova vrednost se trenutno koristi samo informativno i ne uzima se u obzir ni za koji obračun.
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index bc5d61cdef8..13cf64e8e7a 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -22,6 +22,7 @@ Movements=Prometi
 ErrorWarehouseRefRequired=Referenca magacina je obavezna
 ListOfWarehouses=Lista magacina
 ListOfStockMovements=Lista prometa zaliha
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Oblast magacina
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Naziv prometa
+DateMovement=Date of movement
 InventoryCode=Promet ili inventarski kod
 IsInPackage=Sadržan u paketu
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/sr_RS/trips.lang b/htdocs/langs/sr_RS/trips.lang
index 8900faf121c..2d6f030f4b2 100644
--- a/htdocs/langs/sr_RS/trips.lang
+++ b/htdocs/langs/sr_RS/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Trošak
-ExpenseReports=Troškovi
 ShowExpenseReport=Prikaži trošak
 Trips=Troškovi
 TripsAndExpenses=Troškovi
@@ -12,6 +10,8 @@ ListOfFees=Lista honorara
 TypeFees=Types of fees
 ShowTrip=Prikaži trošak
 NewTrip=Novi trošak
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Broj kilometara
 DeleteTrip=Obriši trošak
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=Prijavili ste još jedan trošak u sličnom vremenskom periodu.
 AucuneLigne=Nema prijavljenih troškova.
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 91f63884b09..8d7afb5a942 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetektera (webbläsare språk)
 FeatureDisabledInDemo=Funktion avstängd i demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Behörigheter
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Gör att du kan hantera flera företag
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Lämna Framställningar förvaltning
 Module20000Desc=Deklarera och följ de anställda lämnar förfrågningar
 Module39000Name=Produkt mycket
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Funktion för att skicka e-post med hjälp av met
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Regel för att generera förslag på lösenord eller b
 DisableForgetPasswordLinkOnLogonPage=Visa inte länken &quot;Glömt lösenord&quot; på inloggningssidan
 UsersSetup=Användare modul setup
 UserMailRequired=E krävs för att skapa en ny användare
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/sv_SE/commercial.lang b/htdocs/langs/sv_SE/commercial.lang
index 5bbe987392d..9aedb5cb471 100644
--- a/htdocs/langs/sv_SE/commercial.lang
+++ b/htdocs/langs/sv_SE/commercial.lang
@@ -70,3 +70,9 @@ Stats=Försäljningsstatistik
 StatusProsp=Prospect status
 DraftPropals=Utforma kommersiella förslag
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index 4721c67e045..6644a2fb337 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Lämna begäran Spärr
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 513c676f494..40140419403 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unika kontakter av företag
 MailNoChangePossible=Mottagare för validerade e-post kan inte ändras
 SearchAMailing=Sök utskick
 SendMailing=Skicka e-post
-SendMail=Skicka e-post
 SentBy=Skickat av
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Du kan dock skicka dem online genom att lägga till parametern MAILING_LIMIT_SENDBYWEB med värde av maximalt antal e-postmeddelanden du vill skicka genom sessionen. För detta, gå hem - Setup - Annat.
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 54856b99c27..1190cc124f7 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=år
 DurationMonth=månad
 DurationWeek=vecka
@@ -608,6 +610,7 @@ SendByMail=Skicka med Email
 MailSentBy=E-post skickas med
 TextUsedInTheMessageBody=E-organ
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Skicka e-post
 EMail=E-mail
 NoEMail=Ingen e-post
 Email=epost
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Räkningar
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Evenemang
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Projekt
+Projects=Projekt
+Rights=Behörigheter
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 2d1c1031910..224b94dcb24 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Omsättning (för ett företag) eller Budget (för en stiftelse
 DefaultAmount=Standard mängd av abonnemang
 CanEditAmount=Besökare kan välja / redigera del av sin teckning
 MEMBER_NEWFORM_PAYONLINE=Hoppa på integrerad online-betalning sidan
-ByProperties=På egenskaper
-MembersStatisticsByProperties=Medlemsstatistik på egenskaper
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Moms-sats för prenumeration
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index ff692033a82..c7da4226597 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. projekt
 ProjectRef=Project ref.
 ProjectId=Projekt Id
 ProjectLabel=Project label
-Project=Projekt
-Projects=Projekt
 ProjectsArea=Projects Area
 ProjectStatus=Projektstatus
 SharedProject=Alla
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Visa projekt
+ShowTask=Visa uppgift
 SetProject=Ställ projekt
 NoProject=Inget projekt definieras eller ägs
 NbOfProjects=Nb av projekt
@@ -77,6 +76,7 @@ Time=Tid
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslag i samband med projektet
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Öppna projekt
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Projekt kontakter
+TaskContact=Task contacts
 ActionsOnProject=Åtgärder för projektet
 YouAreNotContactOfProject=Du är inte en kontakt på denna privata projekt
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Ta bort tid
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Se även uppgifter som inte tilldelats mig
 ShowMyTasksOnly=Visa bara aktiviteter för mig
-TaskRessourceLinks=Resurser
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projekt som arbetat med denna tredje part
 NoTasks=Inga uppgifter för detta projekt
 LinkedToAnotherCompany=Kopplat till annan tredje part
diff --git a/htdocs/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
index b5bce54de49..0978e189311 100644
--- a/htdocs/langs/sv_SE/salaries.lang
+++ b/htdocs/langs/sv_SE/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 9fb9eb0327e..fe86ee5bd8c 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -22,6 +22,7 @@ Movements=Förändringar
 ErrorWarehouseRefRequired=Lagrets referensnamn krävs
 ListOfWarehouses=Lista över lager
 ListOfStockMovements=Lista över lagerförändringar
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Lager område
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Etikett för lagerrörelse
+DateMovement=Date of movement
 InventoryCode=Lagerrörelse- eller inventeringskod
 IsInPackage=Ingår i förpackning
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang
index 8dd4eb27936..30c704826f8 100644
--- a/htdocs/langs/sv_SE/trips.lang
+++ b/htdocs/langs/sv_SE/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Räkningar
 ShowExpenseReport=Show expense report
 Trips=Räkningar
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Prislista för
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Belopp eller kilometer
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index a47857e3e59..6c73899342a 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 181274892a4..64b005c8278 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/sw_SW/commercial.lang b/htdocs/langs/sw_SW/commercial.lang
index deb66143b82..a832775b36c 100644
--- a/htdocs/langs/sw_SW/commercial.lang
+++ b/htdocs/langs/sw_SW/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
index 462515ca9a2..1c19d69732a 100644
--- a/htdocs/langs/sw_SW/holiday.lang
+++ b/htdocs/langs/sw_SW/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 9e5248aeced..27e041910bf 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 6236f580bf1..88afa53fb70 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index fb7cc76c50e..fd0adc4c264 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index d46076309b7..f2e57a1ff8f 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/sw_SW/salaries.lang b/htdocs/langs/sw_SW/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/sw_SW/salaries.lang
+++ b/htdocs/langs/sw_SW/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 81708ae01c4..aec0029e6c5 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/sw_SW/trips.lang b/htdocs/langs/sw_SW/trips.lang
index bf9fea30f68..a741a9f6e5f 100644
--- a/htdocs/langs/sw_SW/trips.lang
+++ b/htdocs/langs/sw_SW/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 2ee143eaf8d..684ee5008f5 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (ภาษาเบราว์เซอร์)
 FeatureDisabledInDemo=ปิดใช้งานคุณลักษณะในการสาธิต
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=สิทธิ์
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=องค์ประกอบเฉพาะจาก <a href="%s">โมดูลที่เปิดใช้งาน</a> จะแสดง
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=ช่วยให้คุณสามารถจัดกา
 Module6000Name=ขั้นตอนการทำงาน
 Module6000Desc=การจัดการเวิร์กโฟลว์
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=ขอออกจากการบริหารจัดการ
 Module20000Desc=ประกาศและติดตามพนักงานใบร้องขอ
 Module39000Name=สินค้าจำนวนมาก
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=คุณสมบัติที่จะส่
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=กฎข้อแนะนำในการสร้
 DisableForgetPasswordLinkOnLogonPage=ไม่ต้องแสดงการเชื่อมโยง "ลืมรหัสผ่าน" ที่หน้าเข้าสู่ระบบ
 UsersSetup=ผู้ใช้ติดตั้งโมดูล
 UserMailRequired=อีเมลที่จำเป็นในการสร้างผู้ใช้ใหม่
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/th_TH/commercial.lang b/htdocs/langs/th_TH/commercial.lang
index 35a09019ef7..e68c9e9b841 100644
--- a/htdocs/langs/th_TH/commercial.lang
+++ b/htdocs/langs/th_TH/commercial.lang
@@ -70,3 +70,9 @@ Stats=สถิติการขาย
 StatusProsp=สถานะ Prospect
 DraftPropals=ข้อเสนอในเชิงพาณิชย์ร่าง
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index c3571c93fa2..c4e68de470b 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=ออกจากคำขอยกเลิก
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index abc39ad6096..4779a8c7522 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=รายชื่อที่ไม่ซ้ำกัน
 MailNoChangePossible=ผู้รับการตรวจสอบสำหรับการส่งอีเมลที่ไม่สามารถเปลี่ยนแปลงได้
 SearchAMailing=ค้นหาทางไปรษณีย์
 SendMailing=ส่งการส่งอีเมล
-SendMail=ส่งอีเมล
 SentBy=ที่ส่งมาจาก
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=แต่คุณสามารถส่งพวกเขาออนไลน์ด้วยการเพิ่ม MAILING_LIMIT_SENDBYWEB พารามิเตอร์ที่มีค่าจำนวนสูงสุดของอีเมลที่คุณต้องการส่งโดยเซสชั่น สำหรับเรื่องนี้ไปในหน้าแรก - การติดตั้ง - อื่น ๆ
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index aa3da5a2187..4743b001bb3 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -266,8 +266,10 @@ DateApprove2=วันที่อนุมัติ (ที่สองได
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=ปี
 DurationMonth=เดือน
 DurationWeek=สัปดาห์
@@ -608,6 +610,7 @@ SendByMail=ส่งทางอีเมล
 MailSentBy=อีเมล์ที่ส่งมาจาก
 TextUsedInTheMessageBody=ร่างกายอีเมล์
 SendAcknowledgementByMail=Send confirmation email
+SendMail=ส่งอีเมล
 EMail=E-mail
 NoEMail=ไม่มีอีเมล
 Email=อีเมล์
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=รายงานค่าใช้จ่าย
+ExpenseReports=รายงานค่าใช้จ่าย
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=เหตุการณ์ที่เกิดขึ้น
 EMailTemplates=แม่แบบอีเมล
 FileNotShared=File not shared to exernal public
+Project=โครงการ
+Projects=โครงการ
+Rights=สิทธิ์
 # Week day
 Monday=วันจันทร์
 Tuesday=วันอังคาร
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index 377c20cb735..7a06f2e530e 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=มูลค่าการซื้อขาย (สำหร
 DefaultAmount=จำนวนเงินที่เริ่มต้นของการสมัครสมาชิก
 CanEditAmount=ผู้เข้าชมสามารถเลือก / แก้ไขจำนวนเงินของการสมัครสมาชิก
 MEMBER_NEWFORM_PAYONLINE=กระโดดขึ้นไปบนหน้าการชำระเงินออนไลน์แบบบูรณาการ
-ByProperties=โดยลักษณะ
-MembersStatisticsByProperties=สถิติสมาชิกตามลักษณะ
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกโดยธรรมชาติ
 MembersByRegion=แสดงหน้าจอนี้คุณสถิติเกี่ยวกับสมาชิกตามภูมิภาค
 VATToUseForSubscriptions=อัตราภาษีมูลค่าเพิ่มที่จะใช้สำหรับการสมัครสมาชิก
diff --git a/htdocs/langs/th_TH/modulebuilder.lang b/htdocs/langs/th_TH/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/th_TH/modulebuilder.lang
+++ b/htdocs/langs/th_TH/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index b5fe97ef3ba..7ce9ea035d3 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -3,8 +3,6 @@ RefProject=อ้าง โครงการ
 ProjectRef=Project ref.
 ProjectId=Id โครงการ
 ProjectLabel=Project label
-Project=โครงการ
-Projects=โครงการ
 ProjectsArea=Projects Area
 ProjectStatus=สถานะของโครงการ
 SharedProject=ทุกคน
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=แสดงโครงการ
+ShowTask=แสดงงาน
 SetProject=โครงการตั้ง
 NoProject=ไม่มีโครงการที่กำหนดไว้หรือเป็นเจ้าของ
 NbOfProjects=nb ของโครงการ
@@ -77,6 +76,7 @@ Time=เวลา
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=รายชื่อของข้อเสนอในเชิงพาณิชย์ที่เกี่ยวข้องกับโครงการ
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=เปิดโครงการ
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=รายชื่อโครงการ
+TaskContact=Task contacts
 ActionsOnProject=เหตุการณ์ที่เกิดขึ้นในโครงการ
 YouAreNotContactOfProject=คุณยังไม่ได้ติดต่อส่วนตัวของโครงการนี​​้
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=ลบเวลาที่ใช้
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=ดูยังไม่ได้รับมอบหมายงานมาให้ฉัน
 ShowMyTasksOnly=ดูเฉพาะงานที่ได้รับมอบหมายมาให้ฉัน
-TaskRessourceLinks=ทรัพยากร
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=โครงการที่ทุ่มเทให้กับบุคคลที่สามนี้
 NoTasks=ไม่มีงานสำหรับโครงการนี​​้
 LinkedToAnotherCompany=เชื่อมโยงไปยังบุคคลที่สาม
diff --git a/htdocs/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang
index 59f4f029c49..228b84f8471 100644
--- a/htdocs/langs/th_TH/salaries.lang
+++ b/htdocs/langs/th_TH/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=เงินเดือนปัจจุบัน
 THMDescription=ค่านี้อาจจะใช้ในการคำนวณค่าใช้จ่ายของเวลาที่ใช้ในโครงการที่ป้อนโดยผู้ใช้หากโครงการโมดูลถูกนำมาใช้
 TJMDescription=ค่านี้เป็นในปัจจุบันเป็นข้อมูลเท่านั้นและไม่ได้ใช้ในการคำนวณใด ๆ
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 09c9fd6c40a..b3b81b2c4c6 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -22,6 +22,7 @@ Movements=การเคลื่อนไหว
 ErrorWarehouseRefRequired=ชื่ออ้างอิงคลังสินค้าจะต้อง
 ListOfWarehouses=รายชื่อของคลังสินค้า
 ListOfStockMovements=รายการเคลื่อนไหวของหุ้น
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=พื้นที่โกดัง
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=ป้ายของการเคลื่อนไหว
+DateMovement=Date of movement
 InventoryCode=การเคลื่อนไหวหรือรหัสสินค้าคงคลัง
 IsInPackage=เป็นแพคเกจที่มีอยู่
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/th_TH/trips.lang b/htdocs/langs/th_TH/trips.lang
index b38570431df..16ef973d7a2 100644
--- a/htdocs/langs/th_TH/trips.lang
+++ b/htdocs/langs/th_TH/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=รายงานค่าใช้จ่าย
-ExpenseReports=รายงานค่าใช้จ่าย
 ShowExpenseReport=แสดงรายงานค่าใช้จ่าย
 Trips=รายงานค่าใช้จ่าย
 TripsAndExpenses=รายงานค่าใช้จ่าย
@@ -12,6 +10,8 @@ ListOfFees=รายการค่าใช้จ่าย
 TypeFees=Types of fees
 ShowTrip=แสดงรายงานค่าใช้จ่าย
 NewTrip=รายงานค่าใช้จ่ายใหม่
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=จำนวนเงินหรือกิโลเมตร
 DeleteTrip=ลบรายงานค่าใช้จ่าย
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=คุณได้ประกาศรายงานค่าใช้จ่ายอื่นเข้ามาในช่วงวันที่ที่คล้ายกัน
 AucuneLigne=มีรายงานค่าใช้จ่ายไม่มีการประกาศความเป็นส่วนตัว
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index adabd0f9864..fb23481271d 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index c558eff8ced..6e8d16ed432 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Çifte kayıt hatalarını gözardı et (GÖZARDI ET EKLE
 AutoDetectLang=Otoalgıla (tarayıcı dili)
 FeatureDisabledInDemo=Özellik demoda devre dışıdır
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=İzinler
 BoxesDesc=Ekran etiketleri, sayfaları kişiselleştirmek için ekleyeceğiniz bazı bilgiler gösteren ekran araçlarıdır. Bu ekran etiketlerini gösterip göstermemeyi seçebilirsiniz ya da hedef sayfayı seçip 'Etkinleştir'e tıklayabilir ya da engellemek için çöp kutusuna tıklayabilirsiniz.
 OnlyActiveElementsAreShown=Yalnızca <ahref="modules.php">etkinleştirilmiş modüllerin</a> öğeleri gösterilmiştir.
 ModulesDesc=Dolibarr modülleri, yazılımda hangi uygulamanın/özelliğin etkinleştirildiğini tanımlar. Bazı uygulamalar/modüller onları etkinleştirdikten sonra kullanıcılara vermeniz gereken izinleri gerektirir. Bir modülü/uygulamayı etkinleştirmek için aç/kapat butonuna tıklayın.
@@ -593,7 +592,7 @@ Module5000Desc=Birden çok firmayı yönetmenizi sağlar
 Module6000Name=İş akışı
 Module6000Desc=İş akışı yönetimi
 Module10000Name=Websiteleri
-Module10000Desc=Bir WYSIWG düzenleyici ile genel websiteleri oluturun. Internet üzerinde çevrimiçi görünmesi için Web sunucunuzu size ayrılmış dizini gösterecek şekilde ayarlayın.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=İzin İstekleri yönetimi
 Module20000Desc=Çalışanların izin isteklerini bildirin ve izleyin
 Module39000Name=Ürün partisi
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA="PHP doğrudan posta" yöntemini kullanarak posta
 TranslationSetup=Çeviri ayarları
 TranslationKeySearch=Çeviri anahtarı veya dizesi ara
 TranslationOverwriteKey=Çeviri dizesinin üzerine yaz
-TranslationDesc=Ekran görüntü dilinin nasıl değiştirileceği :<br>* Tüm sistemde: <strong>Giriş - Ayarlar - Ekran</strong><br>* Her kullanıcı için: <strong>Kullanıcı ekranı ayarları</strong> kullanıcı kartı sekmesindeki (ekranın tepesindeki kullanıcı adına tıklayın).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=Ayrıca aşağıdaki tabloyu doldurarak dizeleri geçersiz kılabilirsiniz. Dilinizi "%s" açılır tablosundan seçin, anahtar dizeyi "%s" içine ekleyin ve yeni çevirinizi de "%s" içine ekleyin.
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Çeviri dizesi
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Önerilen parola oluşturmak ya da parola doğrulamak
 DisableForgetPasswordLinkOnLogonPage=Oturum açma sayfasında “Parola unutuldu” bağlantısını gösterme
 UsersSetup=Kullanıcılar modülü kurulumu
 UserMailRequired=Yeni bir kullanıcı oluşturmak için gerekli EPosta
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Varsayılan aralık numarası
 ##### HRM setup #####
 HRMSetup=İK modülü ayarları
 ##### Company setup #####
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index b946c2ae310..45fbaf4e86f 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -70,3 +70,9 @@ Stats=Satış istatistikleri
 StatusProsp=Aday durumu
 DraftPropals=Taslak teklifler
 NoLimit=Sınır yok
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index 9724e468d4a..3f8a59efe74 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=İzin isteği iptali
 EmployeeLastname=Çalışanın soyadı
 EmployeeFirstname=Çalışanın ilk adı
 TypeWasDisabledOrRemoved=Ayrılma türü (id %s) devre dışı bırakıldı veya kaldırıldı
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=İzin tahsislerinin son otomatik güncellenmesi
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index e65813abe8f..678ff9141e8 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Benzersiz kişiler/adresler
 MailNoChangePossible=Doğrulanmış epostaların alıcıları değiştirilemez
 SearchAMailing=Eposta ara
 SendMailing=E-posta gönder
-SendMail=E-posta gönder
 SentBy=Gönderen
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Bunula birlikte, oturum tarafından gönderilecek ençok Eposta sayılı MAILING_LIMIT_SENDBYWEB parametresini ekleyerek çevrim içi olarak gönderebilirsiniz. Bunu için Giriş-Kurulum-Diğer menüsüne gidin.
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 83419302d44..7e0c9a2ef68 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Onaylama tarihi (ikinci onaylama)
 RegistrationDate=Registration date
 UserCreation=Oluşturan kullanıcı
 UserModification=Değiştiren kullanıcı
+UserValidation=Validation user
 UserCreationShort=Oluş kullanıcı
 UserModificationShort=Değiş. kullanıcı
+UserValidationShort=Valid. user
 DurationYear=yıl
 DurationMonth=ay
 DurationWeek=hafta
@@ -608,6 +610,7 @@ SendByMail=E-posta ile gönder
 MailSentBy=E-posta ile gönderildi
 TextUsedInTheMessageBody=Mesaj gövdesinde yazı kullanıldı.
 SendAcknowledgementByMail=Onay epostası gönder
+SendMail=E-posta gönder
 EMail=E-posta
 NoEMail=E-posta yok
 Email=Eposta
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Para birimini ayarla
 BulkActions=Toplu eylemler
 ClickToShowHelp=Araç ipucu yardımını göstermek için tıklayın
+Website=Web sitesi
+WebSites=Web sites
+ExpenseReport=Gider raporu
+ExpenseReports=Gider raporları
 HR=İK
 HRAndBank=İK ve Banka
 AutomaticallyCalculated=Otomatik olarak hesaplandı
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Etkinlikler
 EMailTemplates=Eposta şablonları
 FileNotShared=File not shared to exernal public
+Project=Proje
+Projects=Projeler
+Rights=İzinler
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index e1679bf31d4..b590cf0be76 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Ciro (bir firma için) veya Bütçe (bir dernek için)
 DefaultAmount=Varsayılan abonelik tutarı
 CanEditAmount=Ziyaretçi kendi abonelik tutarını seçebeilir/düzenleyebilir
 MEMBER_NEWFORM_PAYONLINE=Entegre çevrimiçi ödeme sayfasına atla
-ByProperties=Özelliklere göre
-MembersStatisticsByProperties=Özelliklere göre üye istatistikleri
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=Bu ekran doğaya göre üye istatistiklerini gösterir.
 MembersByRegion=Bu ekran bölgeye göre üye istatistiklerini gösterir.
 VATToUseForSubscriptions=Abonelikler için kullanılacak KDV oranı
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index 76049bbff79..b7c81b85993 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=Dil için dosya
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll='Tümünü ara' için kullanılır
 DatabaseIndex=Veritabanı dizini
 FileAlreadyExists=%s dosyası zaten mevcut
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index eca5d4b3fdc..562570f8087 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -3,8 +3,6 @@ RefProject=Referans Proje
 ProjectRef=Proje ref.
 ProjectId=Proje Kimliği
 ProjectLabel=Proje etiketi
-Project=Proje
-Projects=Projeler
 ProjectsArea=Projeler Alanı
 ProjectStatus=Proje durumu
 SharedProject=Herkes
@@ -38,6 +36,7 @@ OpenedTasks=Açık görevler
 OpportunitiesStatusForOpenedProjects=Projelerin durumuna göre fırsat tutarı
 OpportunitiesStatusForProjects=Projelerin durumuna göre fırsat tutarı
 ShowProject=Proje göster
+ShowTask=Görev göster
 SetProject=Proje ayarla
 NoProject=Tanımlı ya da sahip olunan hiçbir proje yok
 NbOfProjects=Proje sayısı
@@ -77,6 +76,7 @@ Time=Süre
 ListOfTasks=Görevler listesi
 GoToListOfTimeConsumed=Tüketilen süre listesine git
 GoToListOfTasks=Görevler listesine git
+GanttView=Gantt View
 ListProposalsAssociatedProject=Proje ile ilgili tekliflerin listesi
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Proje aç
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Proje ilgilileri
+TaskContact=Task contacts
 ActionsOnProject=Proje etkinlikleri
 YouAreNotContactOfProject=Bu özel projenin bir ilgilisi değilsiniz
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Harcana süre sil
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Bana atanmamış görevleri de göster
 ShowMyTasksOnly=Yalnızca bana atanmış görevleri göster
-TaskRessourceLinks=Kaynaklar
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Bu üçüncü parti atanmış projeler
 NoTasks=Bu proje için hiçbir görev yok
 LinkedToAnotherCompany=Diğer üçüncü partiye bağlantılı
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index 3faa2aa1898..f4cfaec1054 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -13,3 +13,5 @@ TJM=Ortalama günlük ücret
 CurrentSalary=Güncel maaş
 THMDescription=Bu değer, eğer proje modülü kullanılıyorsa kullanıcılar tarafından girilen bir projede tüketilen sürenin maliyetinin hesaplanması için kullanılır
 TJMDescription=Bu değer yalnızca bilgi amaçlı olup hiçbir hesaplamada kulanılmaz
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index c922f275339..158e867831d 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -22,6 +22,7 @@ Movements=Hareketler
 ErrorWarehouseRefRequired=Depo referans adı gereklidir
 ListOfWarehouses=Depo listesi
 ListOfStockMovements=Stok hareketleri listesi
+MovementId=Movement ID
 StockMovementForId=Eylem ID'si %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Depo alanı
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stok düzeyi faturaya ürün/hizmet eklemeye yeterli
 StockMustBeEnoughForOrder=Stok düzeyi siparişe ürün/hizmet eklemeye yeterli olmalıdır (geçerli gerçek stoğa satır eklerken, otomatik stok değiştirme kuralı ne olursa olsun, kontrol yapılır)
 StockMustBeEnoughForShipment= Stok düzeyi sevkiyata ürün/hizmet eklemeye yeterli olmalıdır (geçerli gerçek stoğa satır eklerken, otomatik stok değiştirme kuralı ne olursa olsun, kontrol yapılır)
 MovementLabel=Hareket etiketi
+DateMovement=Date of movement
 InventoryCode=Hareket veya stok kodu
 IsInPackage=Pakette içerilir
 WarehouseAllowNegativeTransfer=Stok eksi olabilir
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index 1f794ae72e5..b275cac1900 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Gider raporu
-ExpenseReports=Gider raporları
 ShowExpenseReport=Gider raporu göster
 Trips=Gider raporları
 TripsAndExpenses=Giderler raporları
@@ -12,6 +10,8 @@ ListOfFees=Ücretler listesi
 TypeFees=Ücret türleri
 ShowTrip=Gider raporu göster
 NewTrip=Yeni gider raporu
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Tutar ya da kilometre
 DeleteTrip=Gider raporu sil
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Varsayılan aralık numarası
 
 ErrorDoubleDeclaration=Benzer bir tarih aralığı için başka bir gider raporu bildirdiniz.
 AucuneLigne=Bildirilen hiç gider raporu yok
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index 3d9838265dd..dd2e3e541f6 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Websitesi sil
 ConfirmDeleteWebsite=Bu websitesini silmek istediğinizden emin misiniz? Bütün sayfaları ve içeriği silinecektir.
 WEBSITE_PAGENAME=Sayfa adı/rumuz
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=Dış CSS dosyası URL si
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Stil/CSS veya HTML başlığı düzenle
 EditMenu=Menü düzenle
 EditMedias=Edit medias
 EditPageMeta=Meta Düzenle
-Website=Web sitesi
 AddWebsite=Add website
 Webpage=Web sayfası/kapsayıcı
 AddPage=Sayfa/kapsayıcı ekle
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=Harici web sunucusu tarafından sunulan sanal host URL'
 NoPageYet=Henüz hiç sayfa yok
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Sayfa/kapsayıcı kopyala
 CloneSite=Siteyi kopyala
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index c111ba19ec6..1b96f34b1bb 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/uk_UA/commercial.lang b/htdocs/langs/uk_UA/commercial.lang
index 10a67feb124..f077780c3ea 100644
--- a/htdocs/langs/uk_UA/commercial.lang
+++ b/htdocs/langs/uk_UA/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index 8e0131d16d3..7add4c4483f 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 46152fcac44..d0b343f123d 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 7b93cd1bab4..add712b3b10 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Події
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 7f3f41cc480..57b45f276e7 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 8e449107ff4..f20552f687d 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/uk_UA/salaries.lang
+++ b/htdocs/langs/uk_UA/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 1ac4ac68967..be2a5537ac6 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang
index c4fd5073639..1bbc8ef5f80 100644
--- a/htdocs/langs/uk_UA/trips.lang
+++ b/htdocs/langs/uk_UA/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index d91e35fbaee..b58cc1a870f 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 181274892a4..64b005c8278 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passw
 DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
 UsersSetup=Users module setup
 UserMailRequired=EMail required to create a new user
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang
index deb66143b82..a832775b36c 100644
--- a/htdocs/langs/uz_UZ/commercial.lang
+++ b/htdocs/langs/uz_UZ/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=Prospect status
 DraftPropals=Draft commercial proposals
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index 462515ca9a2..1c19d69732a 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 9e5248aeced..27e041910bf 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SendMail=Send email
 SentBy=Sent by
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 9011fb8c8a7..fcc80cb78d3 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -608,6 +610,7 @@ SendByMail=Send by EMail
 MailSentBy=Email sent by
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Send email
 EMail=E-mail
 NoEMail=No email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Events
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=Project
+Projects=Projects
+Rights=Permissions
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index fb7cc76c50e..fd0adc4c264 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
 DefaultAmount=Default amount of subscription
 CanEditAmount=Visitor can choose/edit amount of its subscription
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index d46076309b7..f2e57a1ff8f 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=Project
-Projects=Projects
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Show project
+ShowTask=Show task
 SetProject=Set project
 NoProject=No project defined or owned
 NbOfProjects=Nb of projects
@@ -77,6 +76,7 @@ Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Open project
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Project contacts
+TaskContact=Task contacts
 ActionsOnProject=Events on project
 YouAreNotContactOfProject=You are not a contact of this private project
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 81708ae01c4..aec0029e6c5 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -22,6 +22,7 @@ Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
 ListOfStockMovements=List of stock movements
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index bf9fea30f68..a741a9f6e5f 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=List of fees
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Amount or kilometers
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index fb6969e1c59..bb0c2e174d2 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=Tự động phát hiện (ngôn ngữ trình duyệt)
 FeatureDisabledInDemo=Tính năng đã vô hiệu hóa trong bản demo
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=Phân quyền
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Chỉ có các yếu tố từ <a href="%s">module kích hoạt</a> được hiển thị.
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=Cho phép bạn quản lý đa công ty
 Module6000Name=Quy trình làm việc
 Module6000Desc=Quản lý quy trình làm việc
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Quản lý phiếu nghỉ phép
 Module20000Desc=Khai báo và theo dõi phiếu nghỉ phép của nhân viên
 Module39000Name=Lô Sản phẩm
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=Quy tắc để tạo mật khẩu đề nghị hoặc
 DisableForgetPasswordLinkOnLogonPage=Không hiển thị liên kết "Quên mật khẩu" trên trang đăng nhập
 UsersSetup=Thiết lập module người dùng
 UserMailRequired=Email được yêu cầu để tạo một người dùng mới
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang
index 4695262cf53..0657d3b8dda 100644
--- a/htdocs/langs/vi_VN/commercial.lang
+++ b/htdocs/langs/vi_VN/commercial.lang
@@ -70,3 +70,9 @@ Stats=Thống kê bán hàng
 StatusProsp=Trạng thái KH tiềm năng
 DraftPropals=Dự thảo đơn hàng đề xuất
 NoLimit=No limit
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index 976aa4a0925..42239163d7b 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Để lại yêu cầu hủy bỏ
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 0e2a41ea8bc..e8ef83ae497 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=Địa chỉ liên lạc duy nhất / địa chỉ
 MailNoChangePossible=Người nhận các thư điện tử xác nhận không thể thay đổi
 SearchAMailing=Tìm kiếm chỉ gửi thư
 SendMailing=Gửi email
-SendMail=Gửi email
 SentBy=Gửi
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=Tuy nhiên bạn có thể gửi trực tuyến bằng cách thêm tham số MAILING_LIMIT_SENDBYWEB với giá trị của số lượng tối đa của các email mà bạn muốn gửi bởi phiên. Đối với điều này, hãy vào Trang chủ - Cài đặt - Loại khác.
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 09335dabb54..e46a9f487da 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -266,8 +266,10 @@ DateApprove2=Approving date (second approval)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=năm
 DurationMonth=tháng
 DurationWeek=tuần
@@ -608,6 +610,7 @@ SendByMail=Gửi bởi Email
 MailSentBy=Email gửi bởi
 TextUsedInTheMessageBody=Thân email
 SendAcknowledgementByMail=Send confirmation email
+SendMail=Gửi email
 EMail=E-mail
 NoEMail=Không có email
 Email=Email
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=Sự kiện
 EMailTemplates=Mẫu email
 FileNotShared=File not shared to exernal public
+Project=Dự án
+Projects=Các dự án
+Rights=Phân quyền
 # Week day
 Monday=Thứ Hai
 Tuesday=Thứ Ba
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 6ea068bd14b..27742e8610b 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=Doanh thu (cho một công ty) hay Ngân sách nhà nước (đ
 DefaultAmount=Số lượng mặc định của mô tả
 CanEditAmount=Khách có thể chọn / chỉnh sửa số lượng mô tả của mình
 MEMBER_NEWFORM_PAYONLINE=Nhảy vào trang tích hợp thanh toán trực tuyến
-ByProperties=Bởi đặc điểm
-MembersStatisticsByProperties=Thành viên thống kê theo các đặc điểm
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=Thuế suất thuế GTGT để sử dụng cho mô tả
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index d5944e553fc..ab82850ffc1 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -3,8 +3,6 @@ RefProject=Tham chiếu dự án
 ProjectRef=Project ref.
 ProjectId=ID dự án
 ProjectLabel=Project label
-Project=Dự án
-Projects=Các dự án
 ProjectsArea=Projects Area
 ProjectStatus=Trạng thái dự án
 SharedProject=Mọi người
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=Hiển thị dự án
+ShowTask=Hiện tác vụ
 SetProject=Lập dự án
 NoProject=Không có dự án được xác định hoặc tự tạo
 NbOfProjects=Nb của dự án
@@ -77,6 +76,7 @@ Time=Thời gian
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=Danh sách các đơn hàng đề xuất được gắn với dự án
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=Mở dự án
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=Liên lạc dự án
+TaskContact=Task contacts
 ActionsOnProject=Các sự kiện trên dự án
 YouAreNotContactOfProject=Bạn không là một liên hệ của dự án riêng tư này
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=Xóa thời gian đã qua
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=Xem thêm tác vụ không được gán cho tôi
 ShowMyTasksOnly=Xem chỉ tác vụ được gán cho tôi
-TaskRessourceLinks=Tài nguyên
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=Các dự án được dành riêng cho bên thứ ba này
 NoTasks=Không có tác vụ nào cho dự án này
 LinkedToAnotherCompany=Được liên kết đến các bên thứ ba
diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index 23904b7ced0..80fac533e8b 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index dd623e9d37b..994ea9b6da8 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -22,6 +22,7 @@ Movements=Danh sách chuyển kho
 ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết
 ListOfWarehouses=Danh sách kho
 ListOfStockMovements=Danh sách chuyển động kho
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang
index e7e24fe7ac5..74d10d5006b 100644
--- a/htdocs/langs/vi_VN/trips.lang
+++ b/htdocs/langs/vi_VN/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
 ShowExpenseReport=Show expense report
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
@@ -12,6 +10,8 @@ ListOfFees=Danh sách phí
 TypeFees=Types of fees
 ShowTrip=Show expense report
 NewTrip=New expense report
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=Số tiền hoặc km
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index aa1829243bc..d5c4477a042 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index a612871a427..3b4f0b36668 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
 AutoDetectLang=自动检测(浏览器的语言)
 FeatureDisabledInDemo=功能在演示版中已禁用
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=权限
 BoxesDesc=小组件展示一些可以添加到您个人页面的信息。您可以通过选择目标页面点击“激活”或关闭按钮来选择显示或关闭这些小组件。
 OnlyActiveElementsAreShown=仅显示 <a href="%s">已启用模块</a> 的元素。
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=允许你管理多个公司
 Module6000Name=工作流程
 Module6000Desc=工作流管理
 Module10000Name=网站
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=请假申请管理
 Module20000Desc=请假申请提交和跟进管理模块
 Module39000Name=产品库
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=翻译设置
 TranslationKeySearch=搜索翻译键值或字符串
 TranslationOverwriteKey=覆盖翻译字符串
-TranslationDesc=如何设置显示的应用程序的语言 :<br>* 系统侧边栏: 菜单 <strong>主页 - 设置 - 主题</strong><br>* 用户个性主题: <strong>用户看板设置</strong> 菜单在用户个人资料信息卡中 (点击屏幕右上角的用户名).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=翻译字符串
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=生成推荐密码和验证密码的规则
 DisableForgetPasswordLinkOnLogonPage=禁用登陆页面的“找回密码”功能超链接
 UsersSetup=用户模块设置
 UserMailRequired=新创建用户时需要输入电子邮箱地址
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=人力资源管理模块设置
 ##### Company setup #####
diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
index 02a82c94c8b..eda214f123f 100644
--- a/htdocs/langs/zh_CN/commercial.lang
+++ b/htdocs/langs/zh_CN/commercial.lang
@@ -70,3 +70,9 @@ Stats=销售统计
 StatusProsp=准客户状态
 DraftPropals=起草商业报价
 NoLimit=没有限制
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 4fe8c7032b6..571fad17dbe 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=请假申请取消
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=最后自动更新请假分配
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 9493f842755..479e7f56a84 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=唯一联系人/地址
 MailNoChangePossible=为验证电子邮件收件人无法改变
 SearchAMailing=搜索邮件
 SendMailing=发送电子邮件
-SendMail=发送电子邮件
 SentBy=发送
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=但是您可以发送到网上，加入与最大的电子邮件数量值参数MAILING_LIMIT_SENDBYWEB你要发送的会议。
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 5aefcf27a78..e26da7875b3 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -266,8 +266,10 @@ DateApprove2=批准日期(二次批准)
 RegistrationDate=Registration date
 UserCreation=创建用户
 UserModification=修改用户
+UserValidation=Validation user
 UserCreationShort=创建用户
 UserModificationShort=修改用户
+UserValidationShort=Valid. user
 DurationYear=年
 DurationMonth=月
 DurationWeek=周
@@ -608,6 +610,7 @@ SendByMail=通过电子邮件发送
 MailSentBy=通过电子邮件发送
 TextUsedInTheMessageBody=电子邮件正文
 SendAcknowledgementByMail=发送确认邮件
+SendMail=发送电子邮件
 EMail=E-mail
 NoEMail=没有电子邮件
 Email=电子邮件
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=网站
+WebSites=Web sites
+ExpenseReport=费用报表
+ExpenseReports=费用报表
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=事件
 EMailTemplates=电子邮件模板
 FileNotShared=File not shared to exernal public
+Project=项目
+Projects=项目
+Rights=权限
 # Week day
 Monday=星期一
 Tuesday=星期二
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 06ab506707b..6e527e863fa 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=营业额（公司）或财政预算案（基础）
 DefaultAmount=默认订阅数
 CanEditAmount=访客是否允许编辑/选择订阅数
 MEMBER_NEWFORM_PAYONLINE=集成在线支付页面跳转
-ByProperties=按特征
-MembersStatisticsByProperties=按特性统计会员
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=增值税率，用于订阅
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index bd9dfe32bf4..4d87e39569b 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -3,8 +3,6 @@ RefProject=项目编号
 ProjectRef=项目编号
 ProjectId=项目ID号
 ProjectLabel=项目标签
-Project=项目
-Projects=项目
 ProjectsArea=项目区
 ProjectStatus=项目状态
 SharedProject=全体同仁
@@ -38,6 +36,7 @@ OpenedTasks=打开任务
 OpportunitiesStatusForOpenedProjects=按有效项目状态机会值
 OpportunitiesStatusForProjects=按项目状态机会值
 ShowProject=显示项目
+ShowTask=显示任务
 SetProject=设置项目
 NoProject=没有项目或拥有的定义
 NbOfProjects=项目数量
@@ -77,6 +76,7 @@ Time=时间
 ListOfTasks=任务列表
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=任务列表
+GanttView=Gantt View
 ListProposalsAssociatedProject=项目相关的商业报价列表
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=打开的项目
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=项目联系人
+TaskContact=Task contacts
 ActionsOnProject=项目活动
 YouAreNotContactOfProject=你是不是这个私人项目联系
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=删除的时间
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=查看未分配给我的任务
 ShowMyTasksOnly=查看仅分配给我的任务
-TaskRessourceLinks=资源
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=这个项目致力于合伙人
 NoTasks=该项目没有任务
 LinkedToAnotherCompany=链接到其他合伙人
diff --git a/htdocs/langs/zh_CN/salaries.lang b/htdocs/langs/zh_CN/salaries.lang
index 2806dc9e6c6..813828710b3 100644
--- a/htdocs/langs/zh_CN/salaries.lang
+++ b/htdocs/langs/zh_CN/salaries.lang
@@ -13,3 +13,5 @@ TJM=平均日薪
 CurrentSalary=当前薪资
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index cb25463412a..f3264164877 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -22,6 +22,7 @@ Movements=运动
 ErrorWarehouseRefRequired=仓库引用的名称是必需的
 ListOfWarehouses=仓库列表
 ListOfStockMovements=库存调拨列表
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=仓库区
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=调拨标签
+DateMovement=Date of movement
 InventoryCode=调拨或盘点编码
 IsInPackage=包含在模块包
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang
index dcf3cd2ae4e..2824ff23324 100644
--- a/htdocs/langs/zh_CN/trips.lang
+++ b/htdocs/langs/zh_CN/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=费用报表
-ExpenseReports=费用报表
 ShowExpenseReport=显示费用报表
 Trips=费用报表
 TripsAndExpenses=费用报表
@@ -12,6 +10,8 @@ ListOfFees=费用清单
 TypeFees=费用类型
 ShowTrip=显示费用报表
 NewTrip=新建费用报表
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=金额或公里
 DeleteTrip=删除费用报表
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index 59db14c6b87..8f9018cbf26 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=删除网址
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=页面名字/别名
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=外部CSS文件的URL地址
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=编辑菜单
 EditMedias=Edit medias
 EditPageMeta=编辑 Meta
-Website=网站
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 041b7f0c2d9..bf5afb2b06c 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -189,7 +189,6 @@ IgnoreDuplicateRecords=忽略複製資料的錯誤訊息 (INSERT IGNORE)
 AutoDetectLang=自動檢測（瀏覽器的語言）
 FeatureDisabledInDemo=在演示功能禁用
 FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-Rights=權限
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=只有被<a href="modules.php"> modules.php </a>所啟用的模組才會顯示。
 ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application.
@@ -593,7 +592,7 @@ Module5000Desc=允許你管理多個公司
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name.
 Module20000Name=Leave Requests management
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
@@ -1130,7 +1129,7 @@ SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail dire
 TranslationSetup=Setup of translation
 TranslationKeySearch=Search a translation key or string
 TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: Use the <strong>User display setup</strong> tab on user card (click on username at the top of the screen).
 TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
 TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
 TranslationString=Translation string
@@ -1171,8 +1170,6 @@ RuleForGeneratedPasswords=建議的規則來生成密碼或驗證密碼
 DisableForgetPasswordLinkOnLogonPage=不顯示連結“登錄時忘記密碼”頁面
 UsersSetup=用戶模組設置
 UserMailRequired=創建用戶時需要輸入電子郵件資訊
-DefaultCategoryCar=Default car category
-DefaultRangeNumber=Default range number
 ##### HRM setup #####
 HRMSetup=HRM module setup
 ##### Company setup #####
diff --git a/htdocs/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang
index 9117d19069f..50cdf7d8feb 100644
--- a/htdocs/langs/zh_TW/commercial.lang
+++ b/htdocs/langs/zh_TW/commercial.lang
@@ -70,3 +70,9 @@ Stats=Sales statistics
 StatusProsp=潛在狀態
 DraftPropals=起草商業建議
 NoLimit=無限制
+ToOfferALinkForOnlineSignature=Link for online signature
+WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s
+ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
+ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
+SignatureProposalRef=Signature of quote/commerical proposal %s
+FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index b56aa50c007..86d92dab855 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -79,6 +79,8 @@ HolidaysCancelation=Leave request cancelation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
+LastHolidays=Latest %s leave requests
+AllHolidays=All leave requests
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index a16f673cd96..b859518d228 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -99,7 +99,6 @@ NbOfCompaniesContacts=公司獨特的接觸
 MailNoChangePossible=為驗證電子郵件收件人無法改變
 SearchAMailing=搜尋郵件
 SendMailing=發送電子郵件
-SendMail=發送電子郵件
 SentBy=發送
 MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=但是您可以發送到網上，加入與最大的電子郵件數量值參數MAILING_LIMIT_SENDBYWEB你要發送的會議。
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index b5fa3f59432..422a512ea13 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -266,8 +266,10 @@ DateApprove2=核准日期(主管)
 RegistrationDate=Registration date
 UserCreation=Creation user
 UserModification=Modification user
+UserValidation=Validation user
 UserCreationShort=Creat. user
 UserModificationShort=Modif. user
+UserValidationShort=Valid. user
 DurationYear=年
 DurationMonth=月
 DurationWeek=周
@@ -608,6 +610,7 @@ SendByMail=通過電子郵件發送
 MailSentBy=通過電子郵件發送
 TextUsedInTheMessageBody=電子郵件正文
 SendAcknowledgementByMail=Send confirmation email
+SendMail=發送電子郵件
 EMail=E-mail
 NoEMail=沒有電子郵件
 Email=電子郵件
@@ -808,6 +811,10 @@ ModuleBuilder=Module Builder
 SetMultiCurrencyCode=Set currency
 BulkActions=Bulk actions
 ClickToShowHelp=Click to show tooltip help
+Website=Web site
+WebSites=Web sites
+ExpenseReport=差旅報表
+ExpenseReports=差旅報表
 HR=HR
 HRAndBank=HR and Bank
 AutomaticallyCalculated=Automatically calculated
@@ -818,6 +825,9 @@ Websites=Web sites
 Events=活動
 EMailTemplates=Emails templates
 FileNotShared=File not shared to exernal public
+Project=項目
+Projects=Projects
+Rights=權限
 # Week day
 Monday=星期一
 Tuesday=星期二
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index c0f1d8c66a7..a07fe7ea922 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -168,8 +168,8 @@ TurnoverOrBudget=營業額（公司）或財政預算案（基礎）
 DefaultAmount=拖欠金額認購
 CanEditAmount=遊客可以選擇/編輯其認購金額
 MEMBER_NEWFORM_PAYONLINE=集成在線支付頁面跳轉
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
+ByProperties=By nature
+MembersStatisticsByProperties=Members statistics by nature
 MembersByNature=This screen show you statistics on members by nature.
 MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=VAT rate to use for subscriptions
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index e84805acbeb..77610e4a7af 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -47,6 +47,7 @@ SpecificationFile=File with business rules
 LanguageFile=File for language
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong> ? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
+NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -70,7 +71,7 @@ NoWidget=No widget
 GoToApiExplorer=Go to API explorer
 ListOfPermissionsDefined=List of defined permissions
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible into list ? (Examples: 0=not visible, 1=visible by default on list, -1=not shown by default on list but can be added into list to be viewed)
+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. Using a negative value means field is not shown by default on list but can be selected for viewing)
 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/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 043a9032277..8799b3534b4 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -3,8 +3,6 @@ RefProject=Ref. project
 ProjectRef=Project ref.
 ProjectId=Project Id
 ProjectLabel=Project label
-Project=項目
-Projects=項目
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=每個人
@@ -38,6 +36,7 @@ OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
 ShowProject=顯示項目
+ShowTask=顯示任務
 SetProject=設置項目
 NoProject=沒有項目或擁有的定義
 NbOfProjects=鈮項目
@@ -77,6 +76,7 @@ Time=時間
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
+GanttView=Gantt View
 ListProposalsAssociatedProject=名單與項目有關的商業建議
 ListOrdersAssociatedProject=List of customer orders associated with the project
 ListInvoicesAssociatedProject=List of customer invoices associated with the project
@@ -108,6 +108,7 @@ AlsoCloseAProject=Also close project (keep it open if you still need to follow p
 ReOpenAProject=打開的項目
 ConfirmReOpenAProject=Are you sure you want to re-open this project?
 ProjectContact=項目聯系人
+TaskContact=Task contacts
 ActionsOnProject=行動項目
 YouAreNotContactOfProject=你是不是這個私人項目聯系
 UserIsNotContactOfProject=User is not a contact of this private project
@@ -115,7 +116,7 @@ DeleteATimeSpent=刪除的時間
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=資源
+TaskRessourceLinks=Contacts task
 ProjectsDedicatedToThisThirdParty=這個項目致力於第三方
 NoTasks=該項目沒有任務
 LinkedToAnotherCompany=鏈接到其他第三方
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index 7e0c80d3380..d09814c62b2 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -13,3 +13,5 @@ TJM=Average daily rate
 CurrentSalary=Current salary
 THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
 TJMDescription=This value is currently as information only and is not used for any calculation
+LastSalaries=Latest %s salary payments
+AllSalaries=All salary payments
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 02e63565d9b..411c1879fe8 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -22,6 +22,7 @@ Movements=轉讓
 ErrorWarehouseRefRequired=倉庫引用的名稱為必填
 ListOfWarehouses=倉庫名單
 ListOfStockMovements=庫存轉讓清單
+MovementId=Movement ID
 StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=庫存區
@@ -130,6 +131,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever is rule for automatic stock change)
 StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever is rule for automatic stock change)
 MovementLabel=Label of movement
+DateMovement=Date of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
index bbb6a4d757e..178676d60f9 100644
--- a/htdocs/langs/zh_TW/trips.lang
+++ b/htdocs/langs/zh_TW/trips.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=費用支出報表
-ExpenseReports=費用支出報表
 ShowExpenseReport=費用列表
 Trips=差旅報表
 TripsAndExpenses=費用支出
@@ -12,6 +10,8 @@ ListOfFees=費用清單
 TypeFees=Types of fees
 ShowTrip=費用列表
 NewTrip=新增費用
+LastExpenseReports=Latest %s expense reports
+AllExpenseReports=All expense reports
 CompanyVisited=Company/organisation visited
 FeesKilometersOrAmout=金額或公里
 DeleteTrip=Delete expense report
@@ -71,6 +71,8 @@ EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Parking PV
 EX_CAM_VP=PV maintenance and repair
+DefaultCategoryCar=Default transportation mode
+DefaultRangeNumber=Default range number
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index d4895192d6e..ac8d543e862 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -5,7 +5,7 @@ DeleteWebsite=Delete website
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
 WEBSITE_PAGENAME=Page name/alias
 WEBSITE_HTML_HEADER=HTML Header (common to all pages)
-HtmlHeaderPage=HTML specific header for ppage
+HtmlHeaderPage=HTML specific header for page
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
 WEBSITE_JS_INLINE=Javascript file content (common to all pages)
@@ -17,7 +17,6 @@ EditCss=Edit Style/CSS or HTML header
 EditMenu=Edit menu
 EditMedias=Edit medias
 EditPageMeta=Edit Meta
-Website=Web site
 AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
@@ -39,9 +38,10 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n
 NoPageYet=No pages yet
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br>You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_content_to_include.php'); ?&gt;</strong><br><br>To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br>To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext"&gt;</strong><br>For same file into documents/ecm (open access using the sharing hash key), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=relative_dir/filename.ext&hashp=publicsharekeyoffile"&gt;</strong><br>For a file into documents/media (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=relative_dir/filename.ext"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/media (open access), syntax is:<br><strong>&lt;a href="/viewimage.php?modulepart=medias&amp;file=relative_dir/filename.ext"&gt;</strong><br>
 ClonePage=Clone page/container
 CloneSite=Clone site
+SiteAdded=Web site added
 ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
 PageIsANewTranslation=The new page is a translation of the current page ?
 LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
@@ -52,3 +52,6 @@ OrEnterPageInfoManually=Or create empty page from scratch...
 FetchAndCreate=Fetch and Create
 ExportSite=Export site
 IDOfPage=Id of page
+WebsiteAccount=Web site account
+WebsiteAccounts=Web site accounts
+AddWebsiteAccount=Create web site account

From a98452ae3622fd63438ec068635031428553e2f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Nov 2017 10:52:42 +0100
Subject: [PATCH 63/86] Move translation

---
 htdocs/core/menus/standard/eldy.lib.php | 2 +-
 htdocs/langs/en_US/accountancy.lang     | 1 -
 htdocs/langs/en_US/main.lang            | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 8dcd39f31fa..9e88767f473 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -182,7 +182,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		else $classname = 'class="tmenu"';
 		$idsel='accountancy';
 
-		$menu->add('/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=', $langs->trans("Accountancy"), 0, $showmode, $atarget, "accountancy", '', 52, $id, $idsel, $classname);
+		$menu->add('/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=', $langs->trans("MenuAccountancy"), 0, $showmode, $atarget, "accountancy", '', 52, $id, $idsel, $classname);
 	}
 
 
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index eacfe4fc2aa..869adb18499 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -67,7 +67,6 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
-MenuAccountancy=Accountancy
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 127fbfb929d..979a601fa91 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -650,6 +650,7 @@ Color=Color
 Documents=Linked files
 Documents2=Documents
 UploadDisabled=Upload disabled
+MenuAccountancy=Accountancy
 MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members

From e184cac2c5e72be7873b38a5be3516613e086eeb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Nov 2017 19:58:46 +0100
Subject: [PATCH 64/86] FIX Search into language is ok for file into external
 modules two.

---
 htdocs/admin/translation.php | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index d467c23dd56..8505fab25b9 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -403,6 +403,9 @@ if ($mode == 'searchkey')
 
     $recordtoshow=array();
 
+    // Search modules dirs
+    $modulesdir = dolGetModulesDirs();
+
     $nbempty=0;
     /*var_dump($langcode);
      var_dump($transkey);
@@ -416,22 +419,23 @@ if ($mode == 'searchkey')
     }
     else
     {
-        // Load all translations keys
-        foreach($conf->file->dol_document_root as $keydir => $searchdir)
+        // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
+        foreach($modulesdir as $keydir => $tmpsearchdir)
         {
-            // Directory of translation files
-            $dir_lang = $searchdir."/langs/".$langcode;
-            $dir_lang_osencoded=dol_osencode($dir_lang);
+        	$searchdir = $tmpsearchdir;		// $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
 
-            $filearray=dol_dir_list($dir_lang_osencoded,'files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
+        	// Directory of translation files
+        	$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode;	// The 2 dirname is to go up in dir for 2 levels
+        	$dir_lang_osencoded=dol_osencode($dir_lang);
 
-            foreach($filearray as $file)
-            {
-                $tmpfile=preg_replace('/.lang/i', '', basename($file['name']));
-                $newlang->load($tmpfile, 0, 0, '', 0);                              // Load translation files + database overwrite
-                $newlangfileonly->load($tmpfile, 0, 0, '', 1);                      // Load translation files only
-                //print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
-            }
+        	$filearray=dol_dir_list($dir_lang_osencoded,'files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
+        	foreach($filearray as $file)
+        	{
+        		$tmpfile=preg_replace('/.lang/i', '', basename($file['name']));
+        		$newlang->load($tmpfile, 0, 0, '', 0);                              // Load translation files + database overwrite
+        		$newlangfileonly->load($tmpfile, 0, 0, '', 1);                      // Load translation files only
+        		//print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
+        	}
         }
 
         // Now search into translation array

From a6879775bb787b34a38f055ae97c1c2eec382045 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Nov 2017 19:58:46 +0100
Subject: [PATCH 65/86] FIX Search into language is ok for file into external
 modules two.

---
 htdocs/admin/translation.php | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 51a7d32522e..651335d0a6d 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -338,6 +338,9 @@ if ($mode == 'searchkey')
 
     $recordtoshow=array();
 
+    // Search modules dirs
+    $modulesdir = dolGetModulesDirs();
+
     $nbempty=0;
     /*var_dump($langcode);
      var_dump($transkey);
@@ -351,22 +354,23 @@ if ($mode == 'searchkey')
     }
     else
     {
-        // Load all translations keys
-        foreach($conf->file->dol_document_root as $keydir => $searchdir)
+        // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
+        foreach($modulesdir as $keydir => $tmpsearchdir)
         {
-            // Directory of translation files
-            $dir_lang = $searchdir."/langs/".$langcode;
-            $dir_lang_osencoded=dol_osencode($dir_lang);
+        	$searchdir = $tmpsearchdir;		// $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
 
-            $filearray=dol_dir_list($dir_lang_osencoded,'files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
+        	// Directory of translation files
+        	$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode;	// The 2 dirname is to go up in dir for 2 levels
+        	$dir_lang_osencoded=dol_osencode($dir_lang);
 
-            foreach($filearray as $file)
-            {
-                $tmpfile=preg_replace('/.lang/i', '', basename($file['name']));
-                $newlang->load($tmpfile, 0, 0, '', 0);                              // Load translation files + database overwrite
-                $newlangfileonly->load($tmpfile, 0, 0, '', 1);                      // Load translation files only
-                //print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
-            }
+        	$filearray=dol_dir_list($dir_lang_osencoded,'files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1);
+        	foreach($filearray as $file)
+        	{
+        		$tmpfile=preg_replace('/.lang/i', '', basename($file['name']));
+        		$newlang->load($tmpfile, 0, 0, '', 0);                              // Load translation files + database overwrite
+        		$newlangfileonly->load($tmpfile, 0, 0, '', 1);                      // Load translation files only
+        		//print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
+        	}
         }
 
         // Now search into translation array

From 91fbb4da416f774bab4df40e21eac419311d30ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Nov 2017 20:12:15 +0100
Subject: [PATCH 66/86] Fix changelog

---
 ChangeLog | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e0c9ad462a1..e5966d0eec7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,6 @@ English Dolibarr ChangeLog
 
 
 ***** ChangeLog for 6.0.3 compared to 6.0.2 *****
-
 FIX: #7211 Update qty dispatched on qty change
 FIX: #7458
 FIX: #7593
@@ -31,7 +30,6 @@ FIX: wrong key in selectarray
 FIX: wrong personnal project time spent
 
 ***** ChangeLog for 6.0.2 compared to 6.0.1 *****
-
 FIX: #7148
 FIX: #7288
 FIX: #7366 renaming table with pgsql
@@ -65,7 +63,6 @@ FIX: wrong basePath in the swagger view
 FIX: Implementation of a Luracast recommandation for the REST api server
 
 ***** ChangeLog for 6.0.1 compared to 6.0.* *****
-
 FIX: #7000 Dashboard link for late pending payment supplier invoices do not work
 FIX: #7325 Default VAT rate when editing template invoices is 0%
 FIX: #7330
@@ -107,7 +104,6 @@ FIX: CVE-2017-9840, CVE-2017-14238, CVE-2017-14239, CVE-2017-14240, CVE-2017-142
      CVE-2017-14242 
 
 ***** ChangeLog for 6.0.0 compared to 5.0.* *****
-
 NEW: Add experimental BlockeLog module (to log business events in a non reversible log file).
 NEW: Add a payment module for Stripe. 
 NEW: Add module "Product variant" (like red, blue for the product shoes)

From 192dc43b876919c51be8360ea1660dd253577b50 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 01:16:42 +0100
Subject: [PATCH 67/86] Fix regression

---
 htdocs/api/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index a0e8d337f5d..a102ad67539 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -128,7 +128,7 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' |
     foreach ($modulesdir as $dir)
     {
         // Search available module
-        dol_syslog("Scan directory ".$dir." for module descriptor to after search for API files");
+        dol_syslog("Scan directory ".$dir." for module descriptor files, then search for API files");
 
         $handle=@opendir(dol_osencode($dir));
         if (is_resource($handle))
@@ -140,13 +140,13 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' |
                     $module = strtolower($regmod[1]);
                     $moduledirforclass = getModuleDirForApiClass($module);
                     $modulenameforenabled = $module;
-                    if ($module == 'propale') { $moduleforenabled='propal'; }
+                    if ($module == 'propale') { $modulenameforenabled='propal'; }
 
-                    //dol_syslog("Found module file ".$file." - module=".$module." - moduledirforclass=".$moduledirforclass);
+                    dol_syslog("Found module file ".$file." - module=".$module." - moduledirforclass=".$moduledirforclass);
 
                     // Defined if module is enabled
                     $enabled=true;
-                    if (empty($conf->$moduleforenabled->enabled)) $enabled=false;
+                    if (empty($conf->$modulenameforenabled->enabled)) $enabled=false;
 
                     if ($enabled)
                     {

From 59df957181506c92401e7f4c986482f1c13c1eee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 01:42:04 +0100
Subject: [PATCH 68/86] Fix return HTTP code 501 if calling a non existing api

---
 htdocs/api/index.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index a102ad67539..7bb062c03df 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -235,7 +235,13 @@ if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/resources.json'
         if ($module == 'order')    { $classname='Commande'; }
         //var_dump($classfile);var_dump($classname);exit;
 
-        require_once $dir_part_file;
+        $res = include_once $dir_part_file;
+        if (! $res) 
+        {
+        	print 'API not found (failed to include API file)';
+        	header('HTTP/1.1 501 API not found (failed to include API file)');
+        	exit(0);
+        }
         if (class_exists($classname.'Api')) $api->r->addAPIClass($classname.'Api', '/');
     }
     else
@@ -246,7 +252,14 @@ if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/resources.json'
         $dir_part_file = dol_buildpath('/'.$moduledirforclass.'/class/api_'.$classfile.'.class.php');
         $classname=ucwords($module);
 
-        require_once $dir_part_file;
+        $res = include_once $dir_part_file;
+        if (! $res) 
+        {
+        	print 'API not found (failed to include API file)';
+        	header('HTTP/1.1 501 API not found (failed to include API file)');
+        	exit(0);
+        }
+        	
         if (class_exists($classname)) $api->r->addAPIClass($classname);
     }
 }

From 6ea558b63996c1dcaddb96c3f041df35afc387cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 09:58:22 +0100
Subject: [PATCH 69/86] Update functions.lib.php

---
 htdocs/core/lib/functions.lib.php | 44 +++++++++++++++++++------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a376661829c..93b0a810abb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -517,24 +517,31 @@ function GETPOST($paramname, $check='alpha', $method=0, $filter=NULL, $options=N
 			if (preg_match('/[^0-9,]+/i',$out)) $out='';
 			break;
 		case 'alpha':
-			if (!is_string($out))
-			return $out;
-			$out=trim($out);
-			// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
-			// '../' is dangerous because it allows dir transversals
-			if (preg_match('/"/',$out)) $out='';
-			else if (preg_match('/\.\.\//',$out)) $out='';
+			if (! is_array($out))
+			{
+				$out=trim($out);
+				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
+				// '../' is dangerous because it allows dir transversals
+				if (preg_match('/"/',$out)) $out='';
+				else if (preg_match('/\.\.\//',$out)) $out='';
+			}
 			break;
 		case 'san_alpha':
 			$out=filter_var($out,FILTER_SANITIZE_STRING);
 			break;
 		case 'aZ':
-			$out=trim($out);
-			if (preg_match('/[^a-z]+/i',$out)) $out='';
+			if (! is_array($out))
+			{
+				$out=trim($out);
+				if (preg_match('/[^a-z]+/i',$out)) $out='';
+			}
 			break;
 		case 'aZ09':
-			$out=trim($out);
-			if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
+			if (! is_array($out))
+			{
+				$out=trim($out);
+				if (preg_match('/[^a-z0-9_\-\.]+/i',$out)) $out='';
+			}
 			break;
 		case 'array':
 			if (! is_array($out) || empty($out)) $out=array();
@@ -543,12 +550,15 @@ function GETPOST($paramname, $check='alpha', $method=0, $filter=NULL, $options=N
 			$out=dol_string_nohtmltag($out);
 			break;
 		case 'alphanohtml':	// Recommended for search params
-			$out=trim($out);
-			// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
-			// '../' is dangerous because it allows dir transversals
-			if (preg_match('/"/',$out)) $out='';
-			else if (preg_match('/\.\.\//',$out)) $out='';
-			$out=dol_string_nohtmltag($out);
+			if (! is_array($out))
+			{
+				$out=trim($out);
+				// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
+				// '../' is dangerous because it allows dir transversals
+				if (preg_match('/"/',$out)) $out='';
+				else if (preg_match('/\.\.\//',$out)) $out='';
+				$out=dol_string_nohtmltag($out);
+			}
 			break;
 		case 'custom':
 			if (empty($filter)) return 'BadFourthParameterForGETPOST';

From 417642ba39ff2f1e08daa2eb41159578686e06ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 10:33:04 +0100
Subject: [PATCH 70/86] Standardize interface (search on date modification)

---
 htdocs/accountancy/bookkeeping/list.php       | 42 +++++++++++++++++--
 .../accountancy/class/bookkeeping.class.php   |  2 +
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index c3dd606adb2..eb991d55543 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -46,6 +46,8 @@ $search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST(
 $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
 $search_date_creation_start = dol_mktime(0, 0, 0, GETPOST('date_creation_startmonth', 'int'), GETPOST('date_creation_startday', 'int'), GETPOST('date_creation_startyear', 'int'));
 $search_date_creation_end = dol_mktime(0, 0, 0, GETPOST('date_creation_endmonth', 'int'), GETPOST('date_creation_endday', 'int'), GETPOST('date_creation_endyear', 'int'));
+$search_date_modification_start = dol_mktime(0, 0, 0, GETPOST('date_modification_startmonth', 'int'), GETPOST('date_modification_startday', 'int'), GETPOST('date_modification_startyear', 'int'));
+$search_date_modification_end = dol_mktime(0, 0, 0, GETPOST('date_modification_endmonth', 'int'), GETPOST('date_modification_endday', 'int'), GETPOST('date_modification_endyear', 'int'));
 
 if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
 	$action = 'delbookkeepingyear';
@@ -55,7 +57,6 @@ if (GETPOST("button_export_file_x") || GETPOST("button_export_file.x") || GETPOS
 }
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
-
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
 if ($search_accountancy_code_start == - 1) {
 	$search_accountancy_code_start = '';
@@ -66,7 +67,6 @@ if ($search_accountancy_code_end == - 1) {
 }
 
 $search_accountancy_aux_code = GETPOST("search_accountancy_aux_code");
-
 $search_accountancy_aux_code_start = GETPOST('search_accountancy_aux_code_start', 'alpha');
 if ($search_accountancy_aux_code_start == - 1) {
 	$search_accountancy_aux_code_start = '';
@@ -115,8 +115,10 @@ $arrayfields=array(
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
 	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
+	't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
 );
 
+
 /*
  * Actions
  */
@@ -145,6 +147,8 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_date_end = '';
 	$search_date_creation_start = '';
 	$search_date_creation_end = '';
+	$search_date_modification_start = '';
+	$search_date_modification_end = '';
 }
 
 // Must be after the remove filter action, before the export.
@@ -220,9 +224,19 @@ if (! empty($search_date_creation_start)) {
 }
 if (! empty($search_date_creation_end)) {
 	$filter['t.date_creation<='] = $search_date_creation_end;
-	$tmp=dol_getdate($search_date_end);
+	$tmp=dol_getdate($search_date_creation_end);
 	$param .= '&date_creation_endmonth=' . $tmp['mon'] . '&date_creation_endday=' . $tmp['mday'] . '&date_creation_endyear=' . $tmp['year'];
 }
+if (! empty($search_date_modification_start)) {
+	$filter['t.tms>='] = $search_date_modification_start;
+	$tmp=dol_getdate($search_date_modification_start);
+	$param .= '&date_modification_startmonth=' . $tmp['mon'] . '&date_modification_startday=' . $tmp['mday'] . '&date_modification_startyear=' . $tmp['year'];
+}
+if (! empty($search_date_modification_end)) {
+	$filter['t.tms<='] = $search_date_modification_end;
+	$tmp=dol_getdate($search_date_modification_end);
+	$param .= '&date_modification_endmonth=' . $tmp['mon'] . '&date_modification_endday=' . $tmp['mday'] . '&date_modification_endyear=' . $tmp['year'];
+}
 
 if ($action == 'delbookkeeping') {
 
@@ -512,6 +526,20 @@ if (! empty($arrayfields['t.date_creation']['checked']))
 	print '</div>';
 	print '</td>';
 }
+// Date modification
+if (! empty($arrayfields['t.tms']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $langs->trans('From') . ' ';
+	print $form->select_date($search_date_modification_start, 'date_modification_start', 0, 0, 1);
+	print '</div>';
+	print '<div class="nowrap">';
+	print $langs->trans('to') . ' ';
+	print $form->select_date($search_date_modification_end, 'date_modification_end', 0, 0, 1);
+	print '</div>';
+	print '</td>';
+}
 // Action column
 print '<td class="liste_titre center">';
 $searchpicto=$form->showFilterButtons();
@@ -530,6 +558,7 @@ if (! empty($arrayfields['t.debit']['checked']))				print_liste_field_titre("Deb
 if (! empty($arrayfields['t.credit']['checked']))				print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
 if (! empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
 if (! empty($arrayfields['t.date_creation']['checked']))		print_liste_field_titre("DateCreation", $_SERVER['PHP_SELF'], "t.date_creation", "", $param, 'align="center"', $sortfield, $sortorder);
+if (! empty($arrayfields['t.tms']['checked']))					print_liste_field_titre("DateModification", $_SERVER['PHP_SELF'], "t.tms", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 print "</tr>\n";
 
@@ -624,6 +653,13 @@ if ($num > 0)
 			if (! $i) $totalarray['nbfield']++;
 		}
 
+		// Modification operation date
+		if (! empty($arrayfields['t.tms']['checked']))
+		{
+			print '<td align="center">' . dol_print_date($line->date_modification, 'day') . '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
+
 		// Action column
 		print '<td align="center">';
 		print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 2f5e1a6bbd7..bb6f6949cbb 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -802,6 +802,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key . ' LIKE \'' . $this->db->escape($value) . '%\'';
 				} elseif ($key == 't.date_creation>=' || $key == 't.date_creation<=') {
 					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
+				} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
+					$sqlwhere[] = $key . '\'' . $this->db->idate($value) . '\'';
 				} else {
 					$sqlwhere[] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
 				}

From cd8acf8f12ed6ec1628b736afc6e1101ceafad04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 11:07:47 +0100
Subject: [PATCH 71/86] Fix CSS

---
 htdocs/theme/eldy/style.css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ce0f59cf940..0bc41779596 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2233,7 +2233,7 @@ span.butAction, span.butActionDelete {
 
 .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
 	text-decoration: none;
-	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em !important;
 	padding: 0.6em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
 	font-family: <?php print $fontlist ?>;
     font-weight: normal;

From 28604b4d823ec8a92d4ba84654f198e98a8929c0 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Thu, 2 Nov 2017 11:44:36 +0100
Subject: [PATCH 72/86] New add delete lot

Add empty lot row for adding new lot
When lot qty 0, lot will be deleted from line.
---
 htdocs/expedition/card.php                   | 81 ++++++++++++++++++++
 htdocs/expedition/class/expedition.class.php | 36 ++++-----
 2 files changed, 99 insertions(+), 18 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index eb8c384e37e..ab30f083ebe 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -715,6 +715,80 @@ if (empty($reshook))
 						unset($_POST[$batch]);
 						unset($_POST[$qty]);
 					}
+					// add new batch
+					$lotStock = new Productbatch($db);
+					$batch="batchl".$line_id."_0";
+					$qty = "qtyl".$line_id."_0";
+					$batch_id = GETPOST($batch,'int');
+					$batch_qty = GETPOST($qty, 'int');
+					$lineIdToAddLot = 0;
+					if ($batch_qty > 0 && ! empty($batch_id))
+					{
+						if ($lotStock->fetch($batch_id) > 0)
+						{
+							// check if lotStock warehouse id is same as line warehouse id
+							if ($lines[$i]->entrepot_id > 0)
+							{
+								// single warehouse shipment line
+								if ($lines[i]->entrepot_id == $lotStock->warehouseid)
+								{
+									$lineIdToAddLot = $line_id;
+								}
+							}
+							else if (count($lines[$i]->details_entrepot) > 1)
+							{
+								// multi warehouse shipment lines
+								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
+								{
+									if ($detail_entrepot->entrepot_id == $lotStock->warehouseid)
+									{
+										$lineIdToAddLot = $detail_entrepot->line_id;
+									}
+								}
+							}
+							if ($lineIdToAddLot) 
+							{
+								// add lot to existing line
+								if ($line->fetch($lineIdToAddLot) > 0)
+								{
+									$line->detail_batch->fk_origin_stock = $batch_id;
+									$line->detail_batch->batch = $lotStock->batch;
+									$line->detail_batch->entrepot_id = $lotStock->warehouseid;
+									$line->detail_batch->dluo_qty = $batch_qty;
+									if ($line->update($user) < 0) {
+										setEventMessages($line->error, $line->errors, 'errors');
+										$error++;
+									}
+								}
+								else
+								{
+									setEventMessages($line->error, $line->errors, 'errors');
+									$error++;
+								}
+							}
+							else
+							{
+								// create new line with new lot
+								$line->origin_line_id = $lines[$i]->origin_line_id;
+								$line->entrepot_id = $lotStock->warehouseid;
+								$line->detail_batch[0] = new ExpeditionLineBatch($db);
+								$line->detail_batch[0]->fk_origin_stock = $batch_id;
+								$line->detail_batch[0]->batch = $lotStock->batch;
+								$line->detail_batch[0]->entrepot_id = $lotStock->warehouseid;
+								$line->detail_batch[0]->dluo_qty = $batch_qty;
+								if ($object->create_line_batch($line, $line->array_options) < 0)
+								{
+									setEventMessages($object->error, $object->errors, 'errors');
+									$error++;
+								}
+							}
+						}
+						else 
+						{
+							setEventMessages($lotStock->error, $lotStock->errors, 'errors');
+							$error++;
+						}
+					}
 				}
 				else 
 				{
@@ -2180,6 +2254,13 @@ else if ($id || $ref)
 						print '<td>' . $formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $line->entrepot_id). '</td>';
 						print '</tr>';
 					}
+					// add a 0 qty lot row to be able to add a lot
+					print '<tr>';
+					// Qty to ship or shipped
+					print '<td>' . '<input name="qtyl'.$line_id.'_0" id="qtyl'.$line_id.'_0" type="text" size="4" value="0">' . '</td>';
+					// Batch number managment
+					print '<td>' . $formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product). '</td>';
+					print '</tr>';
 				}
 				else if (! empty($conf->stock->enabled))
 				{
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 3e341e6d5be..0e45248aab4 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2547,7 +2547,7 @@ class ExpeditionLigne extends CommonObjectLine
 		{
 			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");			
 			
-			if (empty($batch_id) || empty($expedition_batch_id) || empty($this->fk_product)) {
+			if (empty($batch_id) || empty($this->fk_product)) {
 				dol_syslog(get_class($this).'::update missing fk_origin_stock (batch_id) and/or fk_product', LOG_ERR);
 				$this->errors[]='ErrorMandatoryParametersNotProvided';
 				$error++;
@@ -2555,7 +2555,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 			// fetch remaining lot qty
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-			if (($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0)
+			if (! $error && ($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0)
 			{
 				$this->errors[]=$this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
@@ -2582,34 +2582,34 @@ class ExpeditionLigne extends CommonObjectLine
 					$this->errors[] = $lot->errors;
 					$error++;
 				}
-				else
+				if (! $error && ! empty($expedition_batch_id))
 				{
 					// delete lot expedition line
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
 					$sql.= " WHERE fk_expeditiondet = ".$this->id;
 					$sql.= " AND rowid = ".$expedition_batch_id;
-		
 					if (!$this->db->query($sql))
 					{
 						$this->errors[]=$this->db->lasterror()." - sql=$sql";
 						$error++;
 					}
-					else if ($qty > 0) 
+				}
+				if (! $error && $this->detail_batch->dluo_qty > 0) 
+				{
+					// create lot expedition line
+					if (isset($lot->id)) 
 					{
-						if (isset($lot->id)) 
+						$shipmentLot = new ExpeditionLineBatch($this->db);
+						$shipmentLot->batch = $lot->batch;
+						$shipmentLot->eatby = $lot->eatby;
+						$shipmentLot->sellby = $lot->sellby;
+						$shipmentLot->entrepot_id = $this->detail_batch->entrepot_id;
+						$shipmentLot->dluo_qty = $this->detail_batch->dluo_qty;
+						$shipmentLot->fk_origin_stock = $batch_id;
+						if ($shipmentLot->create($this->id) < 0) 
 						{
-							$shipmentLot = new ExpeditionLineBatch($this->db);
-							$shipmentLot->batch = $lot->batch;
-							$shipmentLot->eatby = $lot->eatby;
-							$shipmentLot->sellby = $lot->sellby;
-							$shipmentLot->entrepot_id = $this->detail_batch->entrepot_id;
-							$shipmentLot->dluo_qty = $this->detail_batch->dluo_qty;
-							$shipmentLot->fk_origin_stock = $batch_id;
-							if ($shipmentLot->create($this->id) < 0) 
-							{
-								$this->errors[]=$shipmentLot->errors;
-								$error++;
-							}
+							$this->errors[]=$shipmentLot->errors;
+							$error++;
 						}
 					}
 				}

From cfacfab6cf3cf735f47ca32aae6a74e22d15e154 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 12:38:36 +0100
Subject: [PATCH 73/86] NEW Show badge with nbr of shipment on shimpen tab of
 order NEW Add button cancel on shipment creation

---
 htdocs/commande/class/commande.class.php     |  55 ++++--
 htdocs/core/lib/order.lib.php                |   3 +
 htdocs/expedition/card.php                   | 176 +++----------------
 htdocs/expedition/class/expedition.class.php |  60 +++----
 htdocs/expedition/shipment.php               |  10 +-
 htdocs/theme/eldy/style.css.php              |   2 +-
 htdocs/theme/md/style.css.php                |   3 +-
 7 files changed, 109 insertions(+), 200 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index c763ef19f84..058f8cb61c5 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1906,6 +1906,40 @@ class Commande extends CommonOrder
         return $nb;
     }
 
+    /**
+     *	Count numbe rof shipments for this order
+     *
+     * 	@return     int                			<0 if KO, Nb of shipment found if OK
+     */
+    function getNbOfShipments()
+    {
+    	$nb = 0;
+
+    	$sql = 'SELECT COUNT(DISTINCT ed.fk_expedition) as nb';
+    	$sql.= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
+    	$sql.= ' '.MAIN_DB_PREFIX.'commandedet as cd';
+    	$sql.= ' WHERE';
+    	$sql.= ' ed.fk_origin_line = cd.rowid';
+    	$sql.= ' AND cd.fk_commande =' .$this->id;
+    	//print $sql;
+
+    	dol_syslog(get_class($this)."::getNbOfShipments", LOG_DEBUG);
+    	$resql = $this->db->query($sql);
+    	if ($resql)
+    	{
+   			$obj = $this->db->fetch_object($resql);
+   			if ($obj) $nb = $obj->nb;
+
+   			$this->db->free($resql);
+    		return $nb;
+    	}
+    	else
+    	{
+    		$this->error=$this->db->lasterror();
+    		return -1;
+    	}
+    }
+
     /**
      *	Load array this->expeditions of lines of shipments with nb of products sent for each order line
      *  Note: For a dedicated shipment, the fetch_lines can be used to load the qty_asked and qty_shipped. This function is use to return qty_shipped cumulated for the order
@@ -1932,18 +1966,18 @@ class Commande extends CommonOrder
         //print $sql;
 
         dol_syslog(get_class($this)."::loadExpeditions", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
+        $resql = $this->db->query($sql);
+        if ($resql)
         {
-            $num = $this->db->num_rows($result);
+            $num = $this->db->num_rows($resql);
             $i = 0;
             while ($i < $num)
             {
-                $obj = $this->db->fetch_object($result);
+                $obj = $this->db->fetch_object($resql);
                 $this->expeditions[$obj->rowid] = $obj->qty;
                 $i++;
             }
-            $this->db->free();
+            $this->db->free($resql);
             return $num;
         }
         else
@@ -1951,7 +1985,6 @@ class Commande extends CommonOrder
             $this->error=$this->db->lasterror();
             return -1;
         }
-
     }
 
     /**
@@ -2002,18 +2035,18 @@ class Commande extends CommonOrder
             $sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
             $sql.= " WHERE ps.fk_product IN (".join(',',$array_of_product).")";
             $sql.= ' GROUP BY fk_product ';
-            $result = $this->db->query($sql);
-            if ($result)
+            $resql = $this->db->query($sql);
+            if ($resql)
             {
-                $num = $this->db->num_rows($result);
+                $num = $this->db->num_rows($resql);
                 $i = 0;
                 while ($i < $num)
                 {
-                    $obj = $this->db->fetch_object($result);
+                    $obj = $this->db->fetch_object($resql);
                     $this->stocks[$obj->fk_product] = $obj->total;
                     $i++;
                 }
-                $this->db->free();
+                $this->db->free($resql);
             }
         }
         return 0;
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 5d9f9280cc8..92a11c907d4 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -61,10 +61,13 @@ function commande_prepare_head(Commande $object)
 	if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
 	|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))
 	{
+		$nbShipments=$object->getNbOfShipments(); $nbReceiption=0;
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
 		if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipments");
+		if ($nbShipments > 0) $text.= ' <span class="badge">'.$nbShipments.'</span>';
 		if ($conf->expedition_bon->enabled && $conf->livraison_bon->enabled) $text.='/';
 		if ($conf->livraison_bon->enabled)  $text.=$langs->trans("Receivings");
+		if ($nbReceiption > 0) $text.= ' <span class="badge">'.$nbReceiption.'</span>';
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index eb8c384e37e..44efbc46b15 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -607,13 +607,13 @@ if (empty($reshook))
 		$object->fetch($id);
 		$lines = $object->lines;
 		$line = new ExpeditionLigne($db);
-		
+
 		$num_prod = count($lines);
 		for ($i = 0 ; $i < $num_prod ; $i++)
 		{
-			if ($lines[$i]->id == $line_id) 
+			if ($lines[$i]->id == $line_id)
 			{
-				if (count($lines[$i]->details_entrepot) > 1) 
+				if (count($lines[$i]->details_entrepot) > 1)
 				{
 					// delete multi warehouse lines
 					foreach ($lines[$i]->details_entrepot as $details_entrepot) {
@@ -624,7 +624,7 @@ if (empty($reshook))
 						}
 					}
 				}
-				else 
+				else
 				{
 					// delete single warehouse line
 					$line->id = $line_id;
@@ -636,12 +636,12 @@ if (empty($reshook))
 			}
 			unset($_POST["lineid"]);
 		}
-		
+
 		if(! $error) {
 			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
 			exit();
 		}
-		else 
+		else
 		{
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
@@ -657,12 +657,12 @@ if (empty($reshook))
 		$qty=0;
 		$entrepot_id = 0;
 		$batch_id = 0;
-		
+
 		$lines = $object->lines;
 		$num_prod = count($lines);
 		for ($i = 0 ; $i < $num_prod ; $i++)
 		{
-			if ($lines[$i]->id == $line_id) 
+			if ($lines[$i]->id == $line_id)
 			{
 				// line to update
 				$line = new ExpeditionLigne($db);
@@ -680,7 +680,7 @@ if (empty($reshook))
 				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
 				{
 					// line with lot
-					foreach ($lines[$i]->detail_batch as $detail_batch) 
+					foreach ($lines[$i]->detail_batch as $detail_batch)
 					{
 						$lotStock = new Productbatch($db);
 						$batch="batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
@@ -689,13 +689,17 @@ if (empty($reshook))
 						$batch_qty = GETPOST($qty, 'int');
 						if (! empty($batch_id) && ($batch_id != $detail_batch->fk_origin_stock || $batch_qty != $detail_batch->dluo_qty))
 						{
-							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0) 
+							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0)	// $line is ExpeditionLine
 							{
 								if ($lines[$i]->entrepot_id != 0)
 								{
 									// allow update line entrepot_id if not multi warehouse shipping
 									$line->entrepot_id = $lotStock->warehouseid;
 								}
+
+								// detail_batch can be an object with keys, or an array of ExpeditionLineBatch
+								if (empty($line->detail_batch)) $line->detail_batch=new stdClass();
+
 								$line->detail_batch->fk_origin_stock = $batch_id;
 								$line->detail_batch->batch = $lotStock->batch;
 								$line->detail_batch->id = $detail_batch->id;
@@ -706,7 +710,7 @@ if (empty($reshook))
 									$error++;
 								}
 							}
-							else 
+							else
 							{
 								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 								$error++;
@@ -716,7 +720,7 @@ if (empty($reshook))
 						unset($_POST[$qty]);
 					}
 				}
-				else 
+				else
 				{
 					// line without lot
 					if ($lines[$i]->entrepot_id > 0)
@@ -782,7 +786,7 @@ if (empty($reshook))
 				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
-		else 
+		else
 		{
 			header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
@@ -1526,7 +1530,13 @@ if ($action == 'create')
 
             print "</table>";
 
-            print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div>';
+            print '<br>';
+
+            print '<div class="center">';
+            print '<input type="submit" class="button" name="save" value="'.$langs->trans("Create").'">';
+            print ' &nbsp; &nbsp; ';
+            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+            print '</div>';
 
             print '</form>';
 
@@ -1977,7 +1987,7 @@ else if ($id || $ref)
 			}
 			print '</td>';
 		}
-		else 
+		else
 		{
 			if ($object->statut <= 1)
 			{
@@ -1991,7 +2001,7 @@ else if ($id || $ref)
 			{
 				print '<td align="left">'.$langs->trans("WarehouseSource").'</td>';
 			}
-	
+
 			if (! empty($conf->productbatch->enabled))
 			{
 				print '<td align="left">'.$langs->trans("Batch").'</td>';
@@ -2166,7 +2176,7 @@ else if ($id || $ref)
 				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
 				{
 					$line = new ExpeditionLigne($db);
-					foreach ($lines[$i]->detail_batch as $detail_batch) 
+					foreach ($lines[$i]->detail_batch as $detail_batch)
 					{
 						print '<tr>';
 						// Qty to ship or shipped
@@ -2320,7 +2330,7 @@ else if ($id || $ref)
 				{
 					print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 				}
-				else 
+				else
 				{
 					print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
 				}
@@ -2480,136 +2490,6 @@ else if ($id || $ref)
 	$trackid = 'shi'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-
-	/*
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file=$fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('sendings');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			$result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$object->error,$object->errors);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->expedition->dir_output . '/sending/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file=$fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendShippingByEMail'));
-
-		dol_fiche_head('');
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='shi'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'shi'.$object->id);
-		}
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$outputlangs->trans('SendShippingRef','__SHIPPINGREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object, $outputlangs);
-		$formmail->substit['__SHIPPINGREF__']=$object->ref;
-		$formmail->substit['__SHIPPINGTRACKNUM__']=$object->tracking_number;
-		$formmail->substit['__SHIPPINGTRACKNUMURL__']=$object->tracking_url;
-
-		//Find the good contact adress
-		if ($typeobject == 'commande' && $object->$typeobject->id && ! empty($conf->commande->enabled))	{
-			$objectsrc=new Commande($db);
-			$objectsrc->fetch($object->$typeobject->id);
-		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && ! empty($conf->propal->enabled))	{
-			$objectsrc=new Propal($db);
-			$objectsrc->fetch($object->$typeobject->id);
-		}
-		$custcontact='';
-		$contactarr=array();
-		if (is_object($objectsrc))    // For the case the shipment was created without orders
-		{
-    		$contactarr=$objectsrc->liste_contact(-1,'external');
-		}
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-
-				if ($contact['libelle']==$langs->trans('TypeContact_commande_external_CUSTOMER')) {
-
-					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='shipping_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['shippingid']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}*/
 }
 
 
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 3e341e6d5be..872badf9220 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2220,7 +2220,7 @@ class ExpeditionLigne extends CommonObjectLine
 	 */
 	public $fk_expedition;
 
-	var $db;	
+	var $db;
 
 	// From llx_expeditiondet
 	var $qty;
@@ -2232,7 +2232,7 @@ class ExpeditionLigne extends CommonObjectLine
 	 * @var int
 	 */
 	public $entrepot_id;
-	
+
 
 	// From llx_commandedet or llx_propaldet
 	var $qty_asked;
@@ -2249,7 +2249,7 @@ class ExpeditionLigne extends CommonObjectLine
 	var $total_localtax1;   // Total Local tax 1
 	var $total_localtax2;   // Total Local tax 2
 
-	
+
 
 	// Deprecated
 	/**
@@ -2395,7 +2395,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 	/**
 	 * 	Delete shipment line.
-	 *  
+	 *
 	 *	@param		User	$user			User that modify
 	 *	@param		int		$notrigger		0=launch triggers after, 1=disable triggers
 	 * 	@return		int		>0 if OK, <0 if KO
@@ -2407,7 +2407,7 @@ class ExpeditionLigne extends CommonObjectLine
 		$error=0;
 
 		$this->db->begin();
-				
+
 		// delete batch expedition line
 		if ($conf->productbatch->enabled)
 		{
@@ -2420,7 +2420,7 @@ class ExpeditionLigne extends CommonObjectLine
 				$error++;
 			}
 		}
-		
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
 		$sql.= " WHERE rowid = ".$this->id;
 
@@ -2436,7 +2436,7 @@ class ExpeditionLigne extends CommonObjectLine
 					$error++;
 				}
 			}
-			if (! $error && ! $notrigger) 
+			if (! $error && ! $notrigger)
 			{
 				// Call trigger
 				$result=$this->call_trigger('LINESHIPPING_DELETE',$user);
@@ -2458,7 +2458,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else 
+		else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -2469,10 +2469,10 @@ class ExpeditionLigne extends CommonObjectLine
 			return -1*$error;
 		}
 	}
-	
+
 	/**
 	 *  Update a line in database
-	 * 
+	 *
 	 *	@param		User	$user			User that modify
 	 *	@param		int		$notrigger		1 = disable triggers
 	 *  @return		int					< 0 if KO, > 0 if OK
@@ -2480,13 +2480,11 @@ class ExpeditionLigne extends CommonObjectLine
 	function update($user = null, $notrigger = 0)
 	{
 		global $conf;
-		
+
 		$error=0;
 
 		dol_syslog(get_class($this)."::update id=$this->id, entrepot_id=$this->entrepot_id, product_id=$this->fk_product, qty=$this->qty");
 
-		
-
 		$this->db->begin();
 
 		// Clean parameters
@@ -2496,9 +2494,9 @@ class ExpeditionLigne extends CommonObjectLine
 		$batch = null;
 		$batch_id = null;
 		$expedition_batch_id = null;
-		if (is_array($this->detail_batch)) 
+		if (is_array($this->detail_batch)) 	// array of ExpeditionLineBatch
 		{
-			if (count($this->detail_batch) > 1) 
+			if (count($this->detail_batch) > 1)
 			{
 				dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
 				$this->errors[]='ErrorBadParameters';
@@ -2545,8 +2543,8 @@ class ExpeditionLigne extends CommonObjectLine
 
 		if (! empty($batch) && $conf->productbatch->enabled)
 		{
-			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");			
-			
+			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");
+
 			if (empty($batch_id) || empty($expedition_batch_id) || empty($this->fk_product)) {
 				dol_syslog(get_class($this).'::update missing fk_origin_stock (batch_id) and/or fk_product', LOG_ERR);
 				$this->errors[]='ErrorMandatoryParametersNotProvided';
@@ -2560,24 +2558,24 @@ class ExpeditionLigne extends CommonObjectLine
 				$this->errors[]=$this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
 			}
-			else 
+			else
 			{
 				// caculate new total line qty
-				foreach ($lotArray as $lot) 
+				foreach ($lotArray as $lot)
 				{
-					if ($expedition_batch_id != $lot->id) 
+					if ($expedition_batch_id != $lot->id)
 					{
 						$remainingQty += $lot->dluo_qty;
 					}
 				}
 				$qty += $remainingQty;
-				
+
 				//fetch lot details
-				
+
 				// fetch from product_lot
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 				$lot = new Productlot($this->db);
-				if ($lot->fetch(0,$this->fk_product,$batch) < 0) 
+				if ($lot->fetch(0,$this->fk_product,$batch) < 0)
 				{
 					$this->errors[] = $lot->errors;
 					$error++;
@@ -2588,15 +2586,15 @@ class ExpeditionLigne extends CommonObjectLine
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
 					$sql.= " WHERE fk_expeditiondet = ".$this->id;
 					$sql.= " AND rowid = ".$expedition_batch_id;
-		
+
 					if (!$this->db->query($sql))
 					{
 						$this->errors[]=$this->db->lasterror()." - sql=$sql";
 						$error++;
 					}
-					else if ($qty > 0) 
+					else if ($qty > 0)
 					{
-						if (isset($lot->id)) 
+						if (isset($lot->id))
 						{
 							$shipmentLot = new ExpeditionLineBatch($this->db);
 							$shipmentLot->batch = $lot->batch;
@@ -2605,7 +2603,7 @@ class ExpeditionLigne extends CommonObjectLine
 							$shipmentLot->entrepot_id = $this->detail_batch->entrepot_id;
 							$shipmentLot->dluo_qty = $this->detail_batch->dluo_qty;
 							$shipmentLot->fk_origin_stock = $batch_id;
-							if ($shipmentLot->create($this->id) < 0) 
+							if ($shipmentLot->create($this->id) < 0)
 							{
 								$this->errors[]=$shipmentLot->errors;
 								$error++;
@@ -2622,8 +2620,8 @@ class ExpeditionLigne extends CommonObjectLine
 			$sql.= " fk_entrepot = ".$this->entrepot_id;
 			$sql.= " , qty = ".$qty;
 			$sql.= " WHERE rowid = ".$this->id;
-			
-			if (!$this->db->query($sql)) 
+
+			if (!$this->db->query($sql))
 			{
 				$this->errors[]=$this->db->lasterror()." - sql=$sql";
 				$error++;
@@ -2641,7 +2639,7 @@ class ExpeditionLigne extends CommonObjectLine
 				}
 			}
 		}
-		if (! $error && ! $notrigger) 
+		if (! $error && ! $notrigger)
 		{
 			// Call trigger
 			$result=$this->call_trigger('LINESHIPPING_UPDATE',$user);
@@ -2656,7 +2654,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		}
-		else 
+		else
 		{
 			foreach($this->errors as $errmsg)
 			{
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 957d9864e16..0af347c0fb7 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -39,13 +39,7 @@ if (! empty($conf->stock->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/st
 if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$langs->load('orders');
-$langs->load("companies");
-$langs->load("bills");
-$langs->load('propal');
-$langs->load('deliveries');
-$langs->load('stocks');
-$langs->load("productbatch");
+$langs->loadLangs(array('orders',"companies","bills",'propal','deliveries','stocks',"productbatch",'incoterm'));
 
 $id=GETPOST('id','int');			// id of order
 $ref= GETPOST('ref','alpha');
@@ -528,7 +522,7 @@ if ($id > 0 || ! empty($ref))
 		    print '<table width="100%" class="nobordernopadding"><tr><td>';
 		    print $langs->trans('IncotermLabel');
 		    print '<td><td align="right">';
-		    if ($user->rights->commande->creer) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		    if ($user->rights->commande->creer) print '<a href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
 		    else print '&nbsp;';
 		    print '</td></tr></table>';
 		    print '</td>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 0bc41779596..947a476c1de 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -447,7 +447,7 @@ input:-webkit-autofill {
 ::-moz-placeholder { color:#bbb; } 			/* firefox 19+ */
 :-ms-input-placeholder { color:#ccc; } 		/* ie */
 input:-moz-placeholder { color:#ccc; }
-input[name=weight], input[name=volume], input[name=surface], input[name=sizeheight] { margin-right: 6px; }
+input[name=weight], input[name=volume], input[name=surface], input[name=sizeheight], select[name=incoterm_id] { margin-right: 6px; }
 input[name=surface] { margin-right: 4px; }
 fieldset { border: 1px solid #AAAAAA !important; }
 .legendforfieldsetstep { padding-bottom: 10px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 061ab132f99..e8db7ef335b 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -457,7 +457,8 @@ input:-webkit-autofill {
 ::-moz-placeholder { color:#bbb; } 			/* firefox 19+ */
 :-ms-input-placeholder { color:#ccc; } 		/* ie */
 input:-moz-placeholder { color:#ccc; }
-
+input[name=weight], input[name=volume], input[name=surface], input[name=sizeheight], select[name=incoterm_id] { margin-right: 6px; }
+input[name=surface] { margin-right: 4px; }
 fieldset { border: 1px solid #AAAAAA !important; }
 .legendforfieldsetstep { padding-bottom: 10px; }
 

From 38e620d656916da5dbdd4072e05ecdd1c2801295 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 12:48:40 +0100
Subject: [PATCH 74/86] Fix edit of incoterm from the shipments tab

---
 htdocs/expedition/card.php     | 6 +++---
 htdocs/expedition/shipment.php | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 44efbc46b15..f02fbada087 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1533,9 +1533,9 @@ if ($action == 'create')
             print '<br>';
 
             print '<div class="center">';
-            print '<input type="submit" class="button" name="save" value="'.$langs->trans("Create").'">';
-            print ' &nbsp; &nbsp; ';
-            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+            print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+            print '&nbsp; ';
+            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 '</form>';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 0af347c0fb7..3d3d8a0de6c 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -151,6 +151,15 @@ if (empty($reshook))
     		setEventMessages($object->error, $object->errors, 'errors');
     }
 
+    // Set incoterm
+    elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+    {
+    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+    	if ($result < 0) {
+    		setEventMessages($object->error, $object->errors, 'errors');
+    	}
+    }
+
     // shipping method
     if ($action == 'setshippingmethod' && $user->rights->commande->creer) {
         $object = new Commande($db);

From 19f1cd7787f2cf0d110a9c13c77bd0879bbd8b60 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 2 Nov 2017 13:16:00 +0100
Subject: [PATCH 75/86] Fix: move some check in multicompany module

---
 htdocs/user/group/perms.php | 15 ++-------------
 htdocs/user/perms.php       | 10 ++--------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 46477879b14..836049443d3 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -38,11 +38,6 @@ $confirm=GETPOST('confirm', 'alpha');
 $module=GETPOST('module', 'alpha');
 $rights=GETPOST('rights', 'int');
 
-// Users/Groups management only in master entity if transverse mode
-if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)
-{
-	accessforbidden();
-}
 
 // Defini si peux lire les permissions
 $canreadperms=($user->admin || $user->rights->user->user->lire);
@@ -64,16 +59,10 @@ $object->fetch($id);
 $object->getrights();
 
 $entity=$conf->entity;
-if (! empty($conf->multicompany->enabled))
-{
-	if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-		$entity=(GETPOST('entity','int') ? GETPOST('entity','int') : $conf->entity);
-	else
-		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
-}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('groupcard','globalcard'));
+$contextpage=array('groupcard','globalcard');
+$hookmanager->initHooks($contextpage);
 
 
 /**
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 6f89e49af5e..5de81b1dd26 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -71,16 +71,10 @@ $object->fetch($id, '', '', 1);
 $object->getrights();
 
 $entity=$conf->entity;
-if (! empty($conf->multicompany->enabled))
-{
-	if (! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-		$entity=(GETPOST('entity','int') ? GETPOST('entity','int') : $conf->entity);
-	else
-		$entity=(! empty($object->entity) ? $object->entity : $conf->entity);
-}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('usercard','globalcard'));
+$contextpage=array('usercard','globalcard');
+$hookmanager->initHooks($contextpage);
 
 
 /**

From fd86c470a8d6ed3634c18b9ad0026d1bb98b9fec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 13:47:29 +0100
Subject: [PATCH 76/86] FIX #7651 #7748 #7542

---
 htdocs/core/class/html.form.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 9acf2a9e56b..33a591b0fb3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2564,6 +2564,8 @@ class Form
 
 			$this->db->free($result);
 
+			$out.=ajax_combobox($htmlname);
+
 			if (empty($outputmode)) return $out;
 			return $outarray;
 		}

From 15272f6555edb2bea01f2ead9846800ad5f13e9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 13:47:53 +0100
Subject: [PATCH 77/86] Return error code

---
 htdocs/fourn/class/fournisseur.facture.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index c0439ecf3ff..afaa2e6a60f 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -1497,6 +1497,7 @@ class FactureFournisseur extends CommonInvoice
         else
         {
             $this->error=$this->line->error;
+            $this->errors=$this->line->errors;
             $this->db->rollback();
             return -2;
         }

From e39c73a916a2c9582335afb7ceba314aefb2a567 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 14:16:28 +0100
Subject: [PATCH 78/86] Fix translation

---
 htdocs/fourn/card.php             | 2 +-
 htdocs/langs/en_US/suppliers.lang | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 02e0749d8c5..08a57fae706 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -393,7 +393,7 @@ if ($object->id > 0)
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre'.(($num == 0) ? ' nobottom':'').'">';
         print '<td colspan="3">'.$langs->trans("ProductsAndServices").'</td><td align="right">';
-        print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("AllProductServicePrices").' <span class="badge">'.$object->nbOfProductRefs().'</span>';
+        print '<a class="notasortlink" href="'.DOL_URL_ROOT.'/fourn/product/list.php?fourn_id='.$object->id.'">'.$langs->trans("AllProductReferencesOfSupplier").' <span class="badge">'.$object->nbOfProductRefs().'</span>';
         print '</a></td></tr>';
 
 		$return = array();
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index 28c5fe39d0d..f9e383e09af 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -43,4 +43,5 @@ NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
+AllProductReferencesOfSupplier=All product / service references of supplier
 BuyingPriceNumShort=Supplier prices

From 5febdf7bae523e3815a41ee4bcf1b1eac2f61e10 Mon Sep 17 00:00:00 2001
From: Neil Orley <neil.orley@oeris.fr>
Date: Thu, 2 Nov 2017 15:01:38 +0100
Subject: [PATCH 79/86] NEW Add payment line to a specific invoice using the
 REST API

Add payment line to a specific invoice using the REST API
---
 .../facture/class/api_invoices.class.php      | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 801fb03e6fe..53a12c75674 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -779,6 +779,120 @@ class Invoices extends DolibarrApi
         return $result;
     }
 
+     /**
+     * Add payment line to a specific invoice
+     *
+     * The model schema is defined by the PaymentData class.
+     *
+     * @param int     $id                               Id of invoice
+     * @param string  $datepaye 	  {@from body}  Payment date        {@type timestamp}
+     * @param int     $paiementid 	  {@from body}  Payment mode Id {@min 1}
+     * @param string  $closepaidinvoices  {@from body}  Close paid invoices {@choice yes,no}
+     * @param int     $accountid          {@from body}  Account Id {@min 1}
+     * @param string  $num_paiement       {@from body}  Payment number (optional)
+     * @param string  $comment            {@from body}  Note (optional)
+     * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paiementcode = 'CHQ')
+     * @param string  $chqbank            {@from body}  Issuer bank name (optional)
+     *
+     * @url     POST {id}/addpayment
+     *
+     * @return int  Payment ID
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     */
+    function addPayment($id, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement='', $comment='', $chqemetteur='', $chqbank='') {
+        global $conf;
+
+        require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+
+        if(! DolibarrApiAccess::$user->rights->facture->creer) {
+                throw new RestException(401);
+        }
+        if(empty($id)) {
+                throw new RestException(400, 'Invoice ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('facture',$id)) {
+                throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $request_data = (object) $payment_data;
+        
+        if (! empty($conf->banque->enabled)) {
+            if(empty($accountid)) {
+                throw new RestException(400, 'Account ID is mandatory');
+            }
+        }
+        
+        if(empty($paiementid)) {
+            throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
+        }
+        
+
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Invoice not found');
+        }
+        
+        // Calculate amount to pay
+        $totalpaye = $this->invoice->getSommePaiement();
+        $totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
+        $totaldeposits = $this->invoice->getSumDepositsUsed();
+        $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+        
+        $this->db->begin();
+        // Clean parameters amount if payment is for a credit note
+        if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+            $resteapayer = price2num($resteapayer,'MT');
+            $amounts[$id] = -$resteapayer;
+            // Multicurrency
+            $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+            $multicurrency_amounts[$id] = -$newvalue;
+        } else {
+            $resteapayer = price2num($resteapayer,'MT');
+            $amounts[$id] = $resteapayer;
+            // Multicurrency
+            $newvalue = price2num($this->invoice->multicurrency_total_ttc,'MT');
+            $multicurrency_amounts[$id] = $newvalue;
+        }
+
+        
+        // Creation of payment line
+        $paiement = new Paiement($this->db);
+        $paiement->datepaye     = $datepaye;
+        $paiement->amounts      = $amounts;                           // Array with all payments dispatching with invoice id
+        $paiement->multicurrency_amounts = $multicurrency_amounts;    // Array with all payments dispatching
+        $paiement->paiementid   = $paiementid;
+        $paiement->paiementcode = dol_getIdFromCode($this->db,$paiementid,'c_paiement','id','code',1);
+        $paiement->num_paiement = $num_paiement;
+        $paiement->note         = $comment;
+
+        $paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices=='yes'?1:0));    // This include closing invoices
+        if ($paiement_id < 0)
+        {
+            $this->db->rollback();
+            throw new RestException(400, 'Payment error : '.$paiement->error);
+        }
+        
+        if (! empty($conf->banque->enabled)) {
+            $label='(CustomerInvoicePayment)';
+            
+            if($paiement->paiementcode == 'CHQ' && empty($chqemetteur)) {
+                  throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paiement->paiementcode);
+            }
+            if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label='(CustomerInvoicePaymentBack)';  // Refund of a credit note
+            $result=$paiement->addPaymentToBank(DolibarrApiAccess::$user,'payment',$label,$accountid,$chqemetteur,$chqbank);
+            if ($result < 0)
+            {
+                $this->db->rollback();
+                throw new RestException(400, 'Add payment to bank error : '.$paiement->error);
+            }
+        }
+        $this->db->commit();
+        return $paiement_id;
+    }
+
     /**
      * Clean sensible object datas
      *

From 1b28c45e2c8bc989c14d01a07669a48b44e7e46e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 15:03:09 +0100
Subject: [PATCH 80/86] PERF Links in getNomUrl use only one tag a instead of
 2.

---
 htdocs/comm/action/class/actioncomm.class.php  | 10 ++++++----
 htdocs/comm/propal/class/propal.class.php      | 10 +++++-----
 htdocs/commande/class/commande.class.php       |  9 +++++----
 htdocs/compta/bank/class/account.class.php     | 11 +++++++----
 htdocs/compta/facture/class/facture.class.php  |  7 ++++---
 htdocs/contact/class/contact.class.php         |  9 +++++++--
 htdocs/contrat/class/contrat.class.php         |  9 +++++----
 htdocs/expedition/class/expedition.class.php   |  8 ++++----
 .../class/expensereport.class.php              |  8 +++++---
 htdocs/fichinter/class/fichinter.class.php     |  9 +++++----
 htdocs/fourn/commande/card.php                 |  5 -----
 htdocs/holiday/class/holiday.class.php         | 10 ++++++----
 .../template/class/myobject.class.php          | 12 ++++++------
 htdocs/product/class/product.class.php         |  8 +++++---
 htdocs/projet/class/project.class.php          | 11 +++++++----
 htdocs/projet/class/task.class.php             |  9 ++++++---
 htdocs/societe/class/societe.class.php         |  8 +++++---
 htdocs/user/class/user.class.php               | 18 ++++++++++--------
 18 files changed, 98 insertions(+), 73 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index abfc98b7219..8fd8de639c3 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1135,7 +1135,6 @@ class ActionComm extends CommonObject
 		    if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
 		}
 
-
 		$tooltip = '<u>' . $langs->trans('ShowAction'.$objp->code) . '</u>';
 		if (! empty($this->ref))
 			$tooltip .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
@@ -1204,10 +1203,13 @@ class ActionComm extends CommonObject
             {
                 $libelle.=(($this->type_code && $libelle!=$langs->transnoentities("Action".$this->type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':'');
             }
-            $result.=$linkstart.img_object(($notooltip?'':$langs->trans("ShowAction").': '.$libelle), ($overwritepicto?$overwritepicto:'action'), ($notooltip?'class="valigntextbottom"':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend;
         }
-        if ($withpicto==1) $result.=' ';
-        $result.=$linkstart.$libelleshort.$linkend;
+
+        $result.=$linkstart;
+        if ($withpicto)	$result.=img_object(($notooltip?'':$langs->trans("ShowAction").': '.$libelle), ($overwritepicto?$overwritepicto:'action'), ($notooltip?'class="'.(($withpicto != 2) ? 'paddingright ' : '').'valigntextbottom"':'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+        $result.=$libelleshort;
+        $result.=$linkend;
+
         return $result;
     }
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 6827a3b0a4e..b94045ee747 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3357,11 +3357,11 @@ class Propal extends CommonObject
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-		if ($withpicto)
-			$result.=($linkstart.img_object(($notooltip?'':$label), $this->picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2)
-			$result.=' ';
-		$result.=$linkstart.$this->ref.$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
+
 		return $result;
 	}
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 058f8cb61c5..36162e71384 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3401,7 +3401,6 @@ class Commande extends CommonOrder
 
         if ($short) return $url;
 
-        $picto = 'order';
         $label = '';
 
 		if ($user->rights->commande->lire) {
@@ -3435,9 +3434,11 @@ class Commande extends CommonOrder
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        $result.=$linkstart.$this->ref.$linkend;
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= $this->ref;
+        $result .= $linkend;
+
         return $result;
     }
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 824b3f50f26..6bc9ae16089 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1324,11 +1324,14 @@ class Account extends CommonObject
 			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
 		}
 
-		$link = '<a href="'.$url.$linkclose;
-		$linkend='</a>';
+		$linkstart = '<a href="'.$url.$linkclose;
+		$linkend = '</a>';
+
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref.($option == 'reflabel' && $this->label ? ' - '.$this->label : '');
+		$result .= $linkend;
 
-		if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' ');
-		$result.=$link.$this->ref.($option == 'reflabel' && $this->label ? ' - '.$this->label : '').$linkend;
 		return $result;
 	}
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d53d90886d1..6f36bd016b4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1161,9 +1161,10 @@ class Facture extends CommonInvoice
         $linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$linkstart.($max?dol_trunc($this->ref,$max):$this->ref).$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), $picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= ($max?dol_trunc($this->ref,$max):$this->ref);
+		$result .= $linkend;
 
 		if ($addlinktonotes)
 		{
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 8dba39b4b54..494533fce75 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -40,6 +40,7 @@ class Contact extends CommonObject
 	public $element='contact';
 	public $table_element='socpeople';
 	public $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $picto = 'contact';
 
 	public $civility_id;      // In fact we store civility_code
 	public $civility_code;
@@ -1053,8 +1054,12 @@ class Contact extends CommonObject
 			$linkend='</a>';
 		}
 
-	        if ($withpicto) $result.=($linkstart.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' ');
-			$result.=$linkstart.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend;
+
+		$result.=$linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.=($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs));
+		$result.=$linkend;
+
 		return $result;
 	}
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0379bafc15f..47a40c1b0a3 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1878,7 +1878,6 @@ class Contrat extends CommonObject
 			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
 		//}
 
-		$picto = 'contract';
         $label = '';
 
         if ($user->rights->contrat->lire) {
@@ -1913,9 +1912,11 @@ class Contrat extends CommonObject
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		$result.=$linkstart.$this->ref.$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
+
 		return $result;
 	}
 
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 872badf9220..6f5fcb05926 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1504,11 +1504,11 @@ class Expedition extends CommonObject
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
-		$picto='sending';
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		$result.=$linkstart.$this->ref.$linkend;
 		return $result;
 	}
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index fef6f4b530d..437114ab7df 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1544,7 +1544,6 @@ class ExpenseReport extends CommonObject
 
         if ($short) return $url;
 
-        $picto='trip';
         $label = '<u>' . $langs->trans("ShowExpenseReport") . '</u>';
         if (! empty($this->ref))
             $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
@@ -1583,8 +1582,11 @@ class ExpenseReport extends CommonObject
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
-        $result.=$linkstart.($max?dol_trunc($ref,$max):$ref).$linkend;
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.=($max?dol_trunc($ref,$max):$ref);
+        $result .= $linkend;
+
         return $result;
     }
 
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 68096eea8e9..25cf644db0f 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -671,7 +671,6 @@ class Fichinter extends CommonObject
 		if (! empty($this->ref))
 			$label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
 
-		$picto='intervention';
 		$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
 
 		if ($option !== 'nolink')
@@ -698,9 +697,11 @@ class Fichinter extends CommonObject
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
+
 		return $result;
 	}
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 17fd0235388..6b4f1417100 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1344,11 +1344,6 @@ if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 $help_url='EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 llxHeader('',$langs->trans("Order"),$help_url);
 
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode vue et edition                                                         */
-/*                                                                             */
-/* *************************************************************************** */
 
 $now=dol_now();
 if ($action=='create')
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index c1d43722271..4381eacb3a7 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -828,7 +828,7 @@ class Holiday extends CommonObject
 		global $langs;
 
 		$result='';
-		$picto='holiday';
+
 		$label=$langs->trans("Show").': '.$this->ref;
 
 		$url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
@@ -844,9 +844,11 @@ class Holiday extends CommonObject
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
-		if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
+
 		return $result;
 	}
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 2f268ebecc0..90026e7389c 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -310,12 +310,12 @@ class MyObject extends CommonObject
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-        if ($withpicto)
-        {
-            $result.=($linkstart.img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $linkstart . $this->ref . $linkend;
+		$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;
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
 		return $result;
 	}
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index c39b6902edf..e2ea5d8cb9f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3503,11 +3503,13 @@ class Product extends CommonObject
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
+        $result.=$linkstart;
 		if ($withpicto) {
-			if ($this->type == Product::TYPE_PRODUCT) $result.=($linkstart.img_object(($notooltip?'':$label), 'product', ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
-			if ($this->type == Product::TYPE_SERVICE) $result.=($linkstart.img_object(($notooltip?'':$label), 'service',  ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend.' ');
+			if ($this->type == Product::TYPE_PRODUCT) $result.=(img_object(($notooltip?'':$label), 'product', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
+			if ($this->type == Product::TYPE_SERVICE) $result.=(img_object(($notooltip?'':$label), 'service',  ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
 		}
-		$result.=$linkstart.$newref.$linkend;
+		$result.= $newref;
+		$result.= $linkend;
 		return $result;
 	}
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 3977cc5ed27..9ef2e8d6536 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1018,15 +1018,18 @@ class Project extends CommonObject
         }
 
         $picto = 'projectpub';
-        if (!$this->public) $picto = 'project';
+        if (! $this->public) $picto = 'project';
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart.=$linkclose.'>';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($linkstart . img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1) . $linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$linkstart . $this->ref . $linkend . (($addlabel && $this->title) ? $sep . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), $picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= $this->ref;
+        $result .= $linkend;
+        if ($withpicto != 2) $result.=(($addlabel && $this->title) ? $sep . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
+
         return $result;
     }
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 95601c3a14a..64dc35a94f2 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -632,9 +632,12 @@ class Task extends CommonObject
 
 		$picto='projecttask';
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$linkstart.$this->ref.$linkend . (($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), $picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
+		if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
 		return $result;
 	}
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 48f023076b2..305b6677482 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -46,6 +46,7 @@ class Societe extends CommonObject
 	public $fieldsforcombobox='nom,name_alias';
 	protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord');    // To test if we can delete object
 	protected $childtablesoncascade=array("societe_prices", "societe_log", "societe_address", "product_fournisseur_price", "product_customer_price_log", "product_customer_price", "socpeople", "adherent", "societe_rib", "societe_remise", "societe_remise_except", "societe_commerciaux", "categorie", "notify", "notify_def", "actioncomm");
+	public $picto = 'company';
 
 	/**
 	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
@@ -2007,9 +2008,10 @@ class Societe extends CommonObject
 			$linkend='';
 		}
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$linkstart.($maxlen?dol_trunc($name,$maxlen):$name).$linkend;
+		$result.=$linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip valigntextbottom"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.=($maxlen?dol_trunc($name,$maxlen):$name);
+		$result.=$linkend;
 
 		return $result;
 	}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index c0cf82c3899..b9e7378bd31 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2131,7 +2131,7 @@ class User extends CommonObject
 			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
 		}
 
-		$link='<a href="'.$url.'"';
+		$linkstart='<a href="'.$url.'"';
 		$linkclose="";
 		if (empty($notooltip))
 		{
@@ -2154,11 +2154,11 @@ class User extends CommonObject
 		$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 
-		$link.=$linkclose.'>';
+		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
 		//if ($withpictoimg == -1) $result.='<div class="nowrap">';
-		$result.=$link;
+		$result.=$linkstart;
 		if ($withpictoimg)
 		{
 		  	$paddafterimage='';
@@ -2185,7 +2185,7 @@ class User extends CommonObject
 	}
 
 	/**
-	 *  Renvoie login clicable (avec eventuellement le picto)
+	 *  Return clickable link of login (eventualy with picto)
 	 *
 	 *	@param	int		$withpicto		Include picto into link
 	 *	@param	string	$option			Sur quoi pointe le lien
@@ -2197,17 +2197,19 @@ class User extends CommonObject
 
 		$result='';
 
-		$link = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
+		$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
 		$linkend='</a>';
 
 		if ($option == 'xxx')
 		{
-			$link = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
+			$linkstart = '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$this->id.'">';
 			$linkend='</a>';
 		}
 
-		if ($withpicto) $result.=($link.img_object($langs->trans("ShowUser"),'user').$linkend.' ');
-		$result.=$link.$this->login.$linkend;
+		$result.=$linkstart;
+		if ($withpicto) $result.=img_object($langs->trans("ShowUser"), 'user', 'class="paddingright"');
+		$result.=$this->login;
+		$result.=$linkend;
 		return $result;
 	}
 

From f5e1ca3178dccec99328ec9b50690e6d6211fad7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 15:33:04 +0100
Subject: [PATCH 81/86] Fix break on project

---
 htdocs/core/lib/project.lib.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 1dda47da0dd..2e1c58af27c 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -589,9 +589,10 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
  * @param   int			$restricteditformytask	0=No restriction, 1=Enable add time only if task is a task i am affected to
  * @param	int			$preselectedday			Preselected day
  * @param   array       $isavailable			Array with data that say if user is available for several days for morning and afternoon
+ * @param	int			$oldprojectforbreak		Old project id of last project break
  * @return  $inc
  */
-function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable)
+function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak=0)
 {
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
@@ -611,7 +612,10 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 		}
 	}
 
-	$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+	if (empty($oldprojectforbreak))
+	{
+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 to start break , -1 no break
+	}
 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 	for ($i = 0 ; $i < $numlines ; $i++)
@@ -818,8 +822,8 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 			$level++;
 			if ($lines[$i]->id > 0)
 			{
-				if ($parent == 0) projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable);
-				else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable);
+				if ($parent == 0) projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak);
+				else projectLinesPerDay($inc, $lines[$i]->id, $fuser, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak);
 			}
 			$level--;
 		}
@@ -847,9 +851,10 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
  * @param	string		$mine					Show only task lines I am assigned to
  * @param   int			$restricteditformytask	0=No restriction, 1=Enable add time only if task is a task i am affected to
  * @param   array       $isavailable			Array with data that say if user is available for several days for morning and afternoon
+ * @param	int			$oldprojectforbreak		Old project id of last project break
  * @return  $inc
  */
-function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable)
+function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak=0)
 {
 	global $conf, $db, $user, $bc, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
@@ -871,7 +876,10 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 
 	//dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 
-	$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 = start break, -1 = never break
+	if (empty($oldprojectforbreak))
+	{
+		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:-1);	// 0 = start break, -1 = never break
+	}
 
 	for ($i = 0 ; $i < $numlines ; $i++)
 	{
@@ -1065,8 +1073,8 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 			$level++;
 			if ($lines[$i]->id > 0)
 			{
-				if ($parent == 0) projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable);
-				else projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable);
+				if ($parent == 0) projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lineswithoutlevel0, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak);
+				else projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak);
 			}
 			$level--;
 		}

From d70f9e053e79de9a419aa354c31e2ec6d53ffa1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 16:01:13 +0100
Subject: [PATCH 82/86] Remove the get in url. The GET is already in the
 method.

---
 htdocs/compta/facture/class/api_invoices.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 801fb03e6fe..c1bfbcd6330 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -710,9 +710,9 @@ class Invoices extends DolibarrApi
      * @throws 405
      */
     function useCreditNote($id, $discountid) {
-    
+
         require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
-        
+
         if(! DolibarrApiAccess::$user->rights->facture->creer) {
                 throw new RestException(401);
         }
@@ -745,7 +745,7 @@ class Invoices extends DolibarrApi
      *
      * @param int   $id             Id of invoice
      *
-     * @url     GET {id}/getpayments
+     * @url     GET {id}/payments
      *
      * @return array
      * @throws 400
@@ -775,7 +775,7 @@ class Invoices extends DolibarrApi
         if( $result < 0) {
                 throw new RestException(405, $this->invoice->error);
         }
-        
+
         return $result;
     }
 

From 309e83a946b2add65b58f8525759fe21e61dcfbf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 16:06:44 +0100
Subject: [PATCH 83/86] Remove the "add" in addpayment. Action in API is hosted
 by the method

---
 .../facture/class/api_invoices.class.php       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index e01b979dda1..222404411d7 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -794,7 +794,7 @@ class Invoices extends DolibarrApi
      * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paiementcode = 'CHQ')
      * @param string  $chqbank            {@from body}  Issuer bank name (optional)
      *
-     * @url     POST {id}/addpayment
+     * @url     POST {id}/payments
      *
      * @return int  Payment ID
      * @throws 400
@@ -818,29 +818,29 @@ class Invoices extends DolibarrApi
         }
 
         $request_data = (object) $payment_data;
-        
+
         if (! empty($conf->banque->enabled)) {
             if(empty($accountid)) {
                 throw new RestException(400, 'Account ID is mandatory');
             }
         }
-        
+
         if(empty($paiementid)) {
             throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
         }
-        
+
 
         $result = $this->invoice->fetch($id);
         if( ! $result ) {
             throw new RestException(404, 'Invoice not found');
         }
-        
+
         // Calculate amount to pay
         $totalpaye = $this->invoice->getSommePaiement();
         $totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
         $totaldeposits = $this->invoice->getSumDepositsUsed();
         $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-        
+
         $this->db->begin();
         // Clean parameters amount if payment is for a credit note
         if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
@@ -857,7 +857,7 @@ class Invoices extends DolibarrApi
             $multicurrency_amounts[$id] = $newvalue;
         }
 
-        
+
         // Creation of payment line
         $paiement = new Paiement($this->db);
         $paiement->datepaye     = $datepaye;
@@ -874,10 +874,10 @@ class Invoices extends DolibarrApi
             $this->db->rollback();
             throw new RestException(400, 'Payment error : '.$paiement->error);
         }
-        
+
         if (! empty($conf->banque->enabled)) {
             $label='(CustomerInvoicePayment)';
-            
+
             if($paiement->paiementcode == 'CHQ' && empty($chqemetteur)) {
                   throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paiement->paiementcode);
             }

From 608f87d03ba3787abb4ef56b8ab52accbfc0e501 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 16:14:24 +0100
Subject: [PATCH 84/86] Set focus on first field to fill.

---
 htdocs/admin/translation.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 8505fab25b9..d42ae4b2ade 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -298,9 +298,9 @@ if ($mode == 'overwrite')
     print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit?1:0, 'maxwidthonsmartphone', 1);
     print '</td>'."\n";
     print '<td>';
-    print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" value="'.(!empty($transkey)?$transkey:"").'">';
+    print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" id="transkey" value="'.(!empty($transkey)?$transkey:"").'">';
     print '</td><td>';
-    print '<input type="text" class="quatrevingtpercent"'.$disablededit.' name="transvalue" value="'.(!empty($transvalue)?$transvalue:"").'">';
+    print '<input type="text" class="quatrevingtpercent"'.$disablededit.' name="transvalue" id="transvalue" value="'.(!empty($transvalue)?$transvalue:"").'">';
     print '</td>';
     // Limit to superadmin
     /*if (! empty($conf->multicompany->enabled) && !$user->entity)
@@ -570,6 +570,10 @@ dol_fiche_end();
 
 print "</form>\n";
 
+if (! empty($langcode))
+{
+	dol_set_focus('#transvalue');
+}
 
 llxFooter();
 

From 26b01792b2476b107a7e5da576c0d56c3b1f2ba8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 17:58:46 +0100
Subject: [PATCH 85/86] Code comment

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

diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index f62745437a6..c96fb37afe7 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2013 Florian Henry  <florian.henry@open-concept.pro>
- * Copyright (C) 2013 Juanjo Menent  <jmenent@2byte.es>
- * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
+/* Copyright (C) 2013 Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2013 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015 Frederic France	<frederic.france@free.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
@@ -75,7 +75,7 @@ class box_ficheinter extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter",$max));
 
-		if ($user->rights->ficheinter->lire)
+		if (! empty($user->rights->ficheinter->lire))
 		{
 			$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut,";
 			$sql.= " f.datec,";

From 2a2c0aaa5f620f21e316ecb3d34b487954d69afd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Nov 2017 20:17:27 +0100
Subject: [PATCH 86/86] Clean and debug code to execute CLI commands

---
 htdocs/core/actions_massactions.inc.php |   2 +-
 htdocs/core/lib/website.lib.php         |   2 +
 htdocs/cron/class/cronjob.class.php     | 137 +++++++++++++++---------
 3 files changed, 88 insertions(+), 53 deletions(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 0e9d405d44c..e6e9bbea604 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -567,7 +567,7 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
 				$input_files.=' '.escapeshellarg($f);
 			}
 
-			$cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
+			$cmd = 'pdftk '.escapeshellarg($input_files).' cat output '.escapeshellarg($file);
 			exec($cmd);
 
 			if (! empty($conf->global->MAIN_UMASK))
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 4098c89e4d4..1810e32868f 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -294,6 +294,8 @@ function exportWebSite($website)
  */
 function importWebSite($pathtofile)
 {
+	global $db;
+
 	$result = 0;
 
 	$filename = basename($pathtofile);
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 5ba542c6945..24cac301379 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1051,61 +1051,17 @@ class Cronjob extends CommonObject
 		// Run a command line
 		if ($this->jobtype=='command')
 		{
-			$command=escapeshellcmd($this->command);
-			$command.=" 2>&1";
-			dol_mkdir($conf->cronjob->dir_temp);
-			$outputfile=$conf->cronjob->dir_temp.'/cronjob.'.$userlogin.'.out';
+			$outputdir = $conf->cron->dir_temp;
+			if (empty($outputdir)) $outputdir = $conf->cronjob->dir_temp;
 
-			dol_syslog(get_class($this)."::run_jobs system:".$command, LOG_DEBUG);
-			$output_arr=array();
-
-			$execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2);	// 1 or 2
-			if ($execmethod == 1)
+			if (! empty($outputdir))
 			{
-				exec($command, $output_arr, $retval);
-				if ($retval != 0)
-				{
-				    $langs->load("errors");
-				    dol_syslog(get_class($this)."::run_jobs retval=".$retval, LOG_ERR);
-				    $this->error = 'Error '.$retval;
-				    $this->lastoutput = '';     // Will be filled later
-				    $this->lastresult = $retval;
-				    $retval = $this->lastresult;
-				    $error++;
-				}
+				dol_mkdir($outputdir);
+				$outputfile=$outputdir.'/cronjob.'.$userlogin.'.out';	// File used with popen method
+
+				// Execute a CLI
+				$retval = $this->executeCLI($this->command, $outputfile);
 			}
-			if ($execmethod == 2)
-			{
-				$ok=0;
-				$handle = fopen($outputfile, 'w');
-				if ($handle)
-				{
-					dol_syslog("Run command ".$command);
-					$handlein = popen($command, 'r');
-					while (!feof($handlein))
-					{
-						$read = fgets($handlein);
-						fwrite($handle,$read);
-						$output_arr[]=$read;
-					}
-					pclose($handlein);
-					fclose($handle);
-				}
-				if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-			}
-
-			// Update with result
-    		if (is_array($output_arr) && count($output_arr)>0)
-    		{
-    			foreach($output_arr as $val)
-    			{
-    				$this->lastoutput.=$val."\n";
-    			}
-    		}
-
-    		$this->lastresult=$retval;
-
-    		dol_syslog(get_class($this)."::run_jobs output_arr:".var_export($output_arr,true)." lastoutput=".$this->lastoutput." lastresult=".$this->lastresult, LOG_DEBUG);
 		}
 
 		dol_syslog(get_class($this)."::run_jobs now we update job to track it is finished (with success or error)");
@@ -1125,6 +1081,83 @@ class Cronjob extends CommonObject
 
 	}
 
+
+	/**
+	 * Execute a CLI command.
+	 * this->error, this->lastoutput, this->lastresult are also set.
+	 *
+	 * @param 	string	$command		Command line
+	 * @param 	string	$outputfile		Output file
+	 * @param	int		$execmethod		0=Use default method, 1=Use the PHP 'exec', 2=Use the 'popen' method
+	 * @return	int						Retval
+	 */
+	function executeCLI($command, $outputfile, $execmethod=0)
+	{
+		global $conf, $langs;
+
+		$retval = 0;
+
+		$command=escapeshellcmd($command);
+		$command.=" 2>&1";
+
+		if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
+		if (empty($execmethod)) $execmethod=1;
+		//$execmethod=1;
+
+		dol_syslog(get_class($this)."::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
+		$output_arr=array();
+
+		if ($execmethod == 1)
+		{
+			exec($command, $output_arr, $retval);
+			if ($retval != 0)
+			{
+				$langs->load("errors");
+				dol_syslog(get_class($this)."::executeCLI retval after exec=".$retval, LOG_ERR);
+				$this->error = 'Error '.$retval;
+				$this->lastoutput = '';     // Will be filled later from $output_arr
+				$this->lastresult = $retval;
+				$retval = $this->lastresult;
+				$error++;
+			}
+		}
+		if ($execmethod == 2)	// This method may create
+		{
+			$ok=0;
+			$handle = fopen($outputfile, 'w+b');
+			if ($handle)
+			{
+				dol_syslog(get_class($this)."::executeCLI run command ".$command);
+				$handlein = popen($command, 'r');
+				while (!feof($handlein))
+				{
+					$read = fgets($handlein);
+					fwrite($handle,$read);
+					$output_arr[]=$read;
+				}
+				pclose($handlein);
+				fclose($handle);
+			}
+			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+		}
+
+		// Update with result
+		if (is_array($output_arr) && count($output_arr)>0)
+		{
+			foreach($output_arr as $val)
+			{
+				$this->lastoutput.=$val.($execmethod == 2 ? '' : "\n");
+			}
+		}
+
+		$this->lastresult=$retval;
+
+		dol_syslog(get_class($this)."::executeCLI output_arr:".var_export($output_arr,true)." lastoutput=".$this->lastoutput." lastresult=".$this->lastresult, LOG_DEBUG);
+
+		return $reval;
+	}
+
+
 	/**
 	 * Reprogram a job
 	 *